From: Olivier Goffart <ogoffart@woboq.com>
Date: Wed, 25 Jul 2018 12:08:55 +0000 (+0200)
Subject: Backport 64014dd374dc81cef24898b51830703a527e923f
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~543
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4031fb6d5bd399c6870b0daf1cbbc1f7732980d2;p=nextcloud-desktop.git

Backport 64014dd374dc81cef24898b51830703a527e923f
---

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 3ee2fa6e3..a345a2a62 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -681,7 +681,8 @@ void ProcessDirectoryJob::processFile(PathTuple path,
                     auto up = _discoveryData->_statedb->getUploadInfo(path._original);
                     if (up._valid && up._contentChecksum == remoteChecksumHeader) {
                         // Solve the conflict into an upload, or nothing
-                        item->_instruction = up._modtime == localEntry.modtime ? CSYNC_INSTRUCTION_UPDATE_METADATA : CSYNC_INSTRUCTION_SYNC;
+                        item->_instruction = up._modtime == localEntry.modtime && up._size == localEntry.size
+                            ? CSYNC_INSTRUCTION_UPDATE_METADATA : CSYNC_INSTRUCTION_SYNC;
                         item->_direction = SyncFileItem::Up;
 
                         // Update the etag and other server metadata in the journal already