Skip to content

Commit

Permalink
Fix propagation of ignore list changes
Browse files Browse the repository at this point in the history
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.

#8975
#9149
  • Loading branch information
erikjv committed Oct 15, 2021
1 parent a51a227 commit 4e393e1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
7 changes: 7 additions & 0 deletions changelog/unreleased/9149
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
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.

Fixes: #8975
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

0 comments on commit 4e393e1

Please sign in to comment.