From: Olivier Goffart <ogoffart@woboq.com>
Date: Tue, 29 Oct 2019 12:20:25 +0000 (+0100)
Subject: Discovery: Attempt to fix issue with windows VFS and new files
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~165
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=88f86a56b14f845250bbc285ec1399fb77ea2358;p=nextcloud-desktop.git

Discovery: Attempt to fix issue with windows VFS and new files

(or moved files)
As seen in the log of #7558, a conflict may be issued by mistake.

See investigation in https://github.com/owncloud/client/issues/7558#issuecomment-547385362

This hopefully fix #7558
---

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index b018c1a8c..c43dd5c95 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -331,6 +331,7 @@ void ProcessDirectoryJob::processFile(PathTuple path,
     // remote will be rediscovered. This is just a fallback for a similar check
     // in processFileAnalyzeRemoteInfo().
     if (_queryServer == ParentNotChanged
+        && dbEntry.isValid()
         && (dbEntry._type == ItemTypeVirtualFileDownload
             || localEntry.type == ItemTypeVirtualFileDownload)
         && (localEntry.isValid() || _queryLocal == ParentNotChanged)) {