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

Fix propagation of ignore list changes #9149

Merged
merged 1 commit into from
Oct 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions changelog/unreleased/9149
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions src/gui/folder.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -425,8 +428,6 @@ private slots:
private:
void connectSyncRoot();

bool reloadExcludes();

void showSyncResultPopup();

bool checkLocalPath();
Expand Down
1 change: 1 addition & 0 deletions src/gui/ignorelisteditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down