From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 20 Dec 2022 17:29:24 +0000 (+0100)
Subject: Clean up sync termination and restart procedure after file blacklisting done
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~30^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b333310ffe12568b5136c2280e9b377f1d7f830a;p=nextcloud-desktop.git

Clean up sync termination and restart procedure after file blacklisting done

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 755f4c219..60750e4d1 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1372,9 +1372,6 @@ void Folder::removeLocalE2eFiles()
         return;
     }
 
-    const auto currentSyncPaused = syncPaused();
-    setSyncPaused(true);
-
     qCInfo(lcFolder) << "About to blacklist: " << e2eFoldersToBlacklist;
 
     bool ok = false;
@@ -1386,13 +1383,16 @@ void Folder::removeLocalE2eFiles()
     _journal.setSelectiveSyncList(SyncJournalDb::SelectiveSyncBlackList, expandedBlacklist);
     _journal.setSelectiveSyncList(SyncJournalDb::SelectiveSyncE2eFoldersToRemoveFromBlacklist, e2eFoldersToBlacklist);
 
-    setSyncPaused(currentSyncPaused);
+    if(isBusy()) {
+        slotTerminateSync();
+    }
 
     for (const auto &path : qAsConst(e2eFoldersToBlacklist)) {
         _journal.schedulePathForRemoteDiscovery(path);
+        schedulePathForLocalDiscovery(path);
     }
 
-    scheduleThisFolderSoon();
+    slotScheduleThisFolder();
 }
 
 QString Folder::fileFromLocalPath(const QString &localPath) const