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

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2015-07-07 21:42:25 +0300
committerOlivier Goffart <ogoffart@woboq.com>2015-07-07 21:46:39 +0300
commitd1bfc7a6363421b3c0258846c7b7bd5a99339bce (patch)
treed045d8e9fef7730da33bfa571279aaabe4252f2d /src/gui/ignorelisteditor.cpp
parent41111541c5ecccda9f30d30e8b88d1a1d91b9cf8 (diff)
Settings: fix broken signal/slot connection:
No such slot OCC::GeneralSettings::slotForceRemoteDiscoveryOnFolders() (sender name: 'OCC__IgnoreListEditor') (receiver name: 'OCC__GeneralSettings') The slot was in another settings page (because the button 'edit ignored files' was moved. Move the actual code to IgnoreListEditor where it logically belong. Add a comment on the why this code is there.
Diffstat (limited to 'src/gui/ignorelisteditor.cpp')
-rw-r--r--src/gui/ignorelisteditor.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp
index 537c0f704..23f96b1a3 100644
--- a/src/gui/ignorelisteditor.cpp
+++ b/src/gui/ignorelisteditor.cpp
@@ -14,6 +14,7 @@
#include "configfile.h"
#include "ignorelisteditor.h"
+#include "folderman.h"
#include "ui_ignorelisteditor.h"
#include <QFile>
@@ -97,6 +98,14 @@ void IgnoreListEditor::slotUpdateLocalIgnoreList()
ignores.write(prepend+patternItem->text().toUtf8()+'\n');
}
}
+
+ // We need to force a remote discovery after a change of the ignore list.
+ // Otherwise we would not download the files/directories that are no longer
+ // ignored (because the remote etag did not change) (issue #3172)
+ foreach (Folder* folder, FolderMan::instance()->map()) {
+ folder->journalDb()->forceRemoteDiscoveryNextSync();
+ }
+
} else {
QMessageBox::warning(this, tr("Could not open file"),
tr("Cannot write changes to '%1'.").arg(ignoreFile));