Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AccountSettings: Force sync should wipe the blacklist #6760

Merged
merged 1 commit into from Sep 6, 2018
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -570,6 +570,7 @@ void AccountSettings::slotScheduleCurrentFolderForceFullDiscovery()
{
FolderMan *folderMan = FolderMan::instance();
if (auto folder = folderMan->folder(selectedFolderAlias())) {
folder->slotWipeErrorBlacklist();
folder->slotNextSyncFullLocalDiscovery();
folder->journalDb()->forceRemoteDiscoveryNextSync();
folderMan->scheduleFolder(folder);
@@ -586,6 +587,8 @@ void AccountSettings::slotForceSyncCurrentFolder()
folderMan->scheduleFolder(current);
}

selectedFolder->slotWipeErrorBlacklist(); // issue #6757

// Insert the selected folder at the front of the queue
folderMan->scheduleFolderNext(selectedFolder);
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.