diff options
author | Thomas Preud'homme <robotux@celest.fr> | 2018-03-01 22:39:56 +0000 |
---|---|---|
committer | Thomas Preud'homme <robotux@celest.fr> | 2018-03-01 22:39:56 +0000 |
commit | 5b240dd94561bef6a030b25cfa70838053ad53b2 (patch) | |
tree | 417868397f3c2c7386773f55096a9aa5f8856990 /plugins/CopyEngine/Ultracopier/ListThread.cpp | |
parent | bd56579c7d9de94c17287adefa118290e6b7ba33 (diff) |
New upstream version 1.4.0.4
Diffstat (limited to 'plugins/CopyEngine/Ultracopier/ListThread.cpp')
-rw-r--r-- | plugins/CopyEngine/Ultracopier/ListThread.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/plugins/CopyEngine/Ultracopier/ListThread.cpp b/plugins/CopyEngine/Ultracopier/ListThread.cpp index 4b9cde5..8d47326 100644 --- a/plugins/CopyEngine/Ultracopier/ListThread.cpp +++ b/plugins/CopyEngine/Ultracopier/ListThread.cpp @@ -1160,21 +1160,20 @@ uint64_t ListThread::addToTransfer(const QFileInfo& source,const QFileInfo& dest if(!source.isSymLink()) size=source.size(); const std::string &drive=driveManagement.getDrive(destination.absoluteFilePath().toStdString()); - if(drive.empty()) - abort(); - if(mode!=Ultracopier::Move || drive!=driveManagement.getDrive(source.absoluteFilePath().toStdString())) - { - if(requiredSpace.find(drive)!=requiredSpace.cend()) + if(!drive.empty())//can be a network drive + if(mode!=Ultracopier::Move || drive!=driveManagement.getDrive(source.absoluteFilePath().toStdString())) { - requiredSpace[drive]+=size; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("space needed add: %1, space needed: %2, on: %3").arg(size).arg(requiredSpace.at(drive)).arg(QString::fromStdString(drive)).toStdString()); - } - else - { - requiredSpace[drive]=size; - ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("set space %1 needed, on: %2").arg(size).arg(QString::fromStdString(drive)).toStdString()); + if(requiredSpace.find(drive)!=requiredSpace.cend()) + { + requiredSpace[drive]+=size; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("space needed add: %1, space needed: %2, on: %3").arg(size).arg(requiredSpace.at(drive)).arg(QString::fromStdString(drive)).toStdString()); + } + else + { + requiredSpace[drive]=size; + ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,QStringLiteral("set space %1 needed, on: %2").arg(size).arg(QString::fromStdString(drive)).toStdString()); + } } - } bytesToTransfer+= size; ActionToDoTransfer temp; temp.id = generateIdNumber(); |