Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannah von Reth <hannah.vonreth@owncloud.com>2022-01-12 14:49:08 +0300
committerHannah von Reth <vonreth@kde.org>2022-01-12 15:27:44 +0300
commita94a8abe6ffe2453d8cb6c16812f6d3a7fe59d69 (patch)
tree4a55d7d7b9b101383044d22f273f35060970195f
parentb5e4b562fb0cbcde1f62f81fbcbd4c052dda0f85 (diff)
Ensure to performe a local discovery on force or after a paused sync
Fixes: #9341
-rw-r--r--changelog/unreleased/93415
-rw-r--r--src/gui/accountsettings.cpp3
2 files changed, 7 insertions, 1 deletions
diff --git a/changelog/unreleased/9341 b/changelog/unreleased/9341
new file mode 100644
index 000000000..e9e16fc9e
--- /dev/null
+++ b/changelog/unreleased/9341
@@ -0,0 +1,5 @@
+Bugfix: Run a full local discovery after we where paused or on a forced sync
+
+Previously we did a incremental search wich might have skipped some local changes.
+
+https://github.com/owncloud/client/issues/9341
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 5a48582ce..daf722f2c 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -719,6 +719,7 @@ void AccountSettings::slotEnableCurrentFolder(bool terminate)
if (f->isSyncRunning() && terminate) {
f->slotTerminateSync();
}
+ f->slotNextSyncFullLocalDiscovery(); // ensure we don't forget about local errors
f->setSyncPaused(!currentlyPaused);
// keep state for the icon setting.
@@ -761,7 +762,7 @@ void AccountSettings::slotForceSyncCurrentFolder()
}
selectedFolder->slotWipeErrorBlacklist(); // issue #6757
-
+ selectedFolder->slotNextSyncFullLocalDiscovery(); // ensure we don't forget about local errors
// Insert the selected folder at the front of the queue
folderMan->scheduleFolderNext(selectedFolder);
}