Discovery: Attempt to fix issue with windows VFS and new files
authorOlivier Goffart <ogoffart@woboq.com>
Tue, 29 Oct 2019 12:20:25 +0000 (13:20 +0100)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 09:59:02 +0000 (10:59 +0100)
(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

src/libsync/discovery.cpp

index b018c1a8ce036f7ef6299e2b7a1e18e7835d6624..c43dd5c95a97c05c0b361ebd81e2bad4829d0759 100644 (file)
@@ -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)) {