From: Christian Kamm <mail@ckamm.de>
Date: Thu, 28 Mar 2019 08:33:20 +0000 (+0100)
Subject: Local discovery tracking: On success, also wipe _renameTarget
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~267
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0c0049c908bd070315e54e55194258288c1b9e29;p=nextcloud-desktop.git

Local discovery tracking: On success, also wipe _renameTarget

It's possible that the rename target was in the local discovery list.
---

diff --git a/src/libsync/localdiscoverytracker.cpp b/src/libsync/localdiscoverytracker.cpp
index a55c47724..e7b42308b 100644
--- a/src/libsync/localdiscoverytracker.cpp
+++ b/src/libsync/localdiscoverytracker.cpp
@@ -73,6 +73,8 @@ void LocalDiscoveryTracker::slotItemCompleted(const SyncFileItemPtr &item)
                       || item->_instruction == CSYNC_INSTRUCTION_UPDATE_METADATA))) {
         if (_previousLocalDiscoveryPaths.erase(item->_file.toUtf8()))
             qCDebug(lcLocalDiscoveryTracker) << "wiped successful item" << item->_file;
+        if (!item->_renameTarget.isEmpty() && _previousLocalDiscoveryPaths.erase(item->_renameTarget.toUtf8()))
+            qCDebug(lcLocalDiscoveryTracker) << "wiped successful item" << item->_renameTarget;
     } else {
         _localDiscoveryPaths.insert(item->_file.toUtf8());
         qCDebug(lcLocalDiscoveryTracker) << "inserted error item" << item->_file;