From: Christian Kamm <mail@ckamm.de>
Date: Wed, 6 Mar 2019 13:22:18 +0000 (+0100)
Subject: FolderWatcher: Always notify about conflict files #7073
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~47^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=21b931dc6b5d14565413c8fee432c5bd8a89c893;p=nextcloud-desktop.git

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 b86f55cf6..959c9cacd 100644
--- 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;
     }