From 8fecff5153ceae161e554fa79114c93704ac3ad9 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Thu, 20 Dec 2018 09:45:31 +0100 Subject: [PATCH] Progress: Virtual file creation needs no transfer progress #6933 Treat virtual file creation as a size-less action, similar to propagating renames or deletions. --- src/libsync/progressdispatcher.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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); } /** -- 2.30.2