From 0ba9dc7dd1845104b00192ddcc714b4d28c92601 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 3 Sep 2018 09:45:08 +0200
Subject: [PATCH] AccountSettings: Force sync should wipe the blacklist

Issue #6757
---
 src/gui/accountsettings.cpp | 3 +++
 1 file changed, 3 insertions(+)

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);
     }
-- 
2.30.2