From: Christian Kamm Date: Thu, 20 Dec 2018 08:45:31 +0000 (+0100) Subject: Progress: Virtual file creation needs no transfer progress #6933 X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~355 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8fecff5153ceae161e554fa79114c93704ac3ad9;p=nextcloud-desktop.git Progress: Virtual file creation needs no transfer progress #6933 Treat virtual file creation as a size-less action, similar to propagating renames or deletions. --- diff --git a/src/libsync/progressdispatcher.h b/src/libsync/progressdispatcher.h index fc3c8238d..fdb13bbda 100644 --- a/src/libsync/progressdispatcher.h +++ b/src/libsync/progressdispatcher.h @@ -103,10 +103,13 @@ public: /** Return true if the size needs to be taken in account in the total amount of time */ static inline bool isSizeDependent(const SyncFileItem &item) { - return !item.isDirectory() && (item._instruction == CSYNC_INSTRUCTION_CONFLICT - || item._instruction == CSYNC_INSTRUCTION_SYNC - || item._instruction == CSYNC_INSTRUCTION_NEW - || item._instruction == CSYNC_INSTRUCTION_TYPE_CHANGE); + return !item.isDirectory() + && (item._instruction == CSYNC_INSTRUCTION_CONFLICT + || item._instruction == CSYNC_INSTRUCTION_SYNC + || item._instruction == CSYNC_INSTRUCTION_NEW + || item._instruction == CSYNC_INSTRUCTION_TYPE_CHANGE) + && !(item._type == ItemTypeVirtualFile + || item._type == ItemTypeVirtualFileDehydration); } /**