From: Markus Goetz <markus@woboq.com>
Date: Fri, 23 Jun 2017 14:53:23 +0000 (+0200)
Subject: SyncEngine: Keep local size in SyncItem #5855
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~704^2^2~43^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f4d1a07b7247ec4ab9e6afe1b59f3eb15a40af06;p=nextcloud-desktop.git

SyncEngine: Keep local size in SyncItem #5855
---

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;