From e6990bd04e684e8bdc2765d6629ba6ad48fb5b34 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Wed, 24 Jul 2019 15:07:20 +0200 Subject: [PATCH] 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. --- src/libsync/discovery.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- 2.30.2