From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 3 Sep 2018 07:45:08 +0000 (+0200)
Subject: AccountSettings: Force sync should wipe the blacklist
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~506
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0ba9dc7dd1845104b00192ddcc714b4d28c92601;p=nextcloud-desktop.git

AccountSettings: Force sync should wipe the blacklist

Issue #6757
---

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 47721a10f..e2676b812 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -692,6 +692,7 @@ void AccountSettings::slotScheduleCurrentFolderForceRemoteDiscovery()
 {
     FolderMan *folderMan = FolderMan::instance();
     if (auto folder = folderMan->folder(selectedFolderAlias())) {
+        folder->slotWipeErrorBlacklist();
         folder->journalDb()->forceRemoteDiscoveryNextSync();
         folderMan->scheduleFolder(folder);
     }
@@ -707,6 +708,8 @@ void AccountSettings::slotForceSyncCurrentFolder()
             folderMan->scheduleFolder(current);
         }
 
+        selectedFolder->slotWipeErrorBlacklist(); // issue #6757
+
         // Insert the selected folder at the front of the queue
         folderMan->scheduleFolderNext(selectedFolder);
     }