From f4d1a07b7247ec4ab9e6afe1b59f3eb15a40af06 Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Fri, 23 Jun 2017 16:53:23 +0200 Subject: [PATCH] SyncEngine: Keep local size in SyncItem #5855 --- src/libsync/syncengine.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index 5aa2376b0..5efee80af 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -386,8 +386,10 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote ) if (item->_instruction == CSYNC_INSTRUCTION_NONE || (item->_instruction == CSYNC_INSTRUCTION_IGNORE && instruction != CSYNC_INSTRUCTION_NONE)) { + // Take values from side (local/remote) where instruction is not _NONE item->_instruction = instruction; item->_modtime = file->modtime; + item->_size = file->size; } else { if (instruction != CSYNC_INSTRUCTION_NONE) { qWarning() << "ERROR: Instruction" << item->_instruction << "vs" << instruction << "for" << fileUtf8; @@ -517,7 +519,7 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote ) if (file->etag && file->etag[0]) { item->_etag = file->etag; } - item->_size = file->size; + if (!item->_inode) { item->_inode = file->inode; -- 2.30.2