FolderWatcher: Always notify about conflict files #7073

This makes sure that the conflict list can be updated if a user resolves
a conflict by deleting the local conflict file. Previously one had to
wait for the next sync run.

diff --git a/src/gui/folderwatcher.cpp b/src/gui/folderwatcher.cpp
index b86f55cf66e19c78ab7c10e843f9f3ce637d7102..959c9cacd5412477a4cf027a3cec38f618a91d3b 100644 (file)
--- a/src/gui/folderwatcher.cpp
+++ b/src/gui/folderwatcher.cpp
@@ -60,7 +60,7 @@ bool FolderWatcher::pathIsIgnored(const QString &path)
         return false;
 
 #ifndef OWNCLOUD_TEST
-    if (_folder->isFileExcludedAbsolute(path)) {
+    if (_folder->isFileExcludedAbsolute(path) && !Utility::isConflictFile(path)) {
         qCDebug(lcFolderWatcher) << "* Ignoring file" << path;
         return true;
     }