From: Christian Kamm <mail@ckamm.de>
Date: Wed, 24 Jul 2019 13:07:20 +0000 (+0200)
Subject: Vfs: Make move detection work with virtual files #7001
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~216
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e6990bd04e684e8bdc2765d6629ba6ad48fb5b34;p=nextcloud-desktop.git

Vfs: Make move detection work with virtual files #7001

Previously a checksum computation could be done on a suffix-placeholder
file, making discovery believe that no move took place.
---

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index e0f8cadf6..97a5e9aca 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -881,7 +881,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
         }
 
         // Verify the checksum where possible
-        if (!base._checksumHeader.isEmpty() && item->_type == ItemTypeFile) {
+        if (!base._checksumHeader.isEmpty() && item->_type == ItemTypeFile && base._type == ItemTypeFile) {
             if (computeLocalChecksum(base._checksumHeader, _discoveryData->_localDir + path._original, item)) {
                 qCInfo(lcDisco) << "checking checksum of potential rename " << path._original << item->_checksumHeader << base._checksumHeader;
                 if (item->_checksumHeader != base._checksumHeader) {