diff options
| author | Erik Verbruggen <erik@verbruggen.consulting> | 2021-10-14 18:32:55 +0300 |
|---|---|---|
| committer | Hannah von Reth <vonreth@kde.org> | 2021-10-27 17:20:27 +0300 |
| commit | 4643fc77e4815097d26426a8a796d39b7a770238 (patch) | |
| tree | c50865299e5d549ad0c4301820266fa9ede5f87e | |
| parent | 2b70834dd15c16b2b34efcc3952c5238419581da (diff) | |
Fix propagation of ignore list changes
Previously, when changing the ignore list, those changes would not be
propagated to existing sync folders. Only after restarting the client,
would these changes be applied.
https://github.com/owncloud/client/issues/8975
https://github.com/owncloud/client/pull/9149
| -rw-r--r-- | changelog/unreleased/9149 | 8 | ||||
| -rw-r--r-- | src/gui/folder.h | 5 | ||||
| -rw-r--r-- | src/gui/ignorelisteditor.cpp | 1 |
3 files changed, 12 insertions, 2 deletions
diff --git a/changelog/unreleased/9149 b/changelog/unreleased/9149 new file mode 100644 index 000000000..a31f84053 --- /dev/null +++ b/changelog/unreleased/9149 @@ -0,0 +1,8 @@ +Bugfix: immediately propagate changes to the ignore list + +Previously, when changing the ignore list, those changes would not be +propagated to existing sync folders. Only after restarting the client, +would these changes be applied. + +https://github.com/owncloud/client/issues/8975 +https://github.com/owncloud/client/pull/9149 diff --git a/src/gui/folder.h b/src/gui/folder.h index 3f7d30737..adc64659e 100644 --- a/src/gui/folder.h +++ b/src/gui/folder.h @@ -374,6 +374,9 @@ public slots: */ void schedulePathForLocalDiscovery(const QString &relativePath); + /// Reloads the excludes, used when changing the user-defined excludes after saving them to disk. + bool reloadExcludes(); + private slots: void slotSyncStarted(); void slotSyncFinished(bool); @@ -425,8 +428,6 @@ private slots: private: void connectSyncRoot(); - bool reloadExcludes(); - void showSyncResultPopup(); bool checkLocalPath(); diff --git a/src/gui/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp index 0b11543cb..f6882e300 100644 --- a/src/gui/ignorelisteditor.cpp +++ b/src/gui/ignorelisteditor.cpp @@ -121,6 +121,7 @@ void IgnoreListEditor::slotUpdateLocalIgnoreList() // ignored (because the remote etag did not change) (issue #3172) for (auto *folder : folderMan->map()) { folder->journalDb()->forceRemoteDiscoveryNextSync(); + folder->reloadExcludes(); folder->slotNextSyncFullLocalDiscovery(); folderMan->scheduleFolder(folder); } |