projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
68ace41
)
AccountSettings: Force sync should wipe the blacklist
author
Olivier Goffart
<ogoffart@woboq.com>
Mon, 3 Sep 2018 07:45:08 +0000
(09:45 +0200)
committer
Kevin Ottens
<kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 09:58:06 +0000
(10:58 +0100)
Issue #6757
src/gui/accountsettings.cpp
patch
|
blob
|
history
diff --git
a/src/gui/accountsettings.cpp
b/src/gui/accountsettings.cpp
index 47721a10f192f85b967be0a0d1a1437fe6c440ee..e2676b8125d43fa3e3bc0babb5a0b3d3e9e6ffac 100644
(file)
--- 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);
}