[Pkg-owncloud-commits] [owncloud-client] 178/218: Ignores: Sync after update #3876

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 7bf31e56ab75310ad795e7ee5ceab75642ee38b0
Author: Christian Kamm <mail at ckamm.de>
Date:   Thu Oct 1 15:39:28 2015 +0200

    Ignores: Sync after update #3876
---
 src/gui/ignorelisteditor.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/gui/ignorelisteditor.cpp b/src/gui/ignorelisteditor.cpp
index 508062b..92e5df7 100644
--- a/src/gui/ignorelisteditor.cpp
+++ b/src/gui/ignorelisteditor.cpp
@@ -105,25 +105,27 @@ 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));
     }
 
+    FolderMan * folderMan = FolderMan::instance();
+
     /* handle the hidden file checkbox */
 
     /* the ignoreHiddenFiles flag is a folder specific setting, but for now, it is
      * handled globally. Save it to every folder that is defined.
      */
-    FolderMan::instance()->setIgnoreHiddenFiles(ignoreHiddenFiles());
+    folderMan->setIgnoreHiddenFiles(ignoreHiddenFiles());
+
+    // 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->map()) {
+        folder->journalDb()->forceRemoteDiscoveryNextSync();
+        folderMan->slotScheduleSync(folder);
+    }
 }
 
 void IgnoreListEditor::slotAddPattern()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git