From 88f86a56b14f845250bbc285ec1399fb77ea2358 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 29 Oct 2019 13:20:25 +0100 Subject: [PATCH] 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 --- src/libsync/discovery.cpp | 1 + 1 file changed, 1 insertion(+) 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)) {