mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 23:28:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
(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
This commit is contained in:
Olivier Goffart 2019-10-29 13:20:25 +01:00 committed by Kevin Ottens
parent 513b0c723c
commit 88f86a56b1
No known key found for this signature in database
GPG key ID: 074BBBCB8DECC9E2
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libsync/discovery.cpp
View file

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