From 777350fd92c60cd4c499783d75f71d45df7fd90a Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Mon, 6 Mar 2023 16:40:17 +0100 Subject: [PATCH] prevent restoration of files that are not plain old files would prevent trying to restore pure virtual files Signed-off-by: Matthieu Gallien --- src/libsync/syncengine.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index b74b05bf3a95c..23c41be9e991b 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -992,9 +992,11 @@ void SyncEngine::restoreOldFiles(SyncFileItemVector &syncItems) syncItem->_instruction = CSYNC_INSTRUCTION_CONFLICT; break; case CSYNC_INSTRUCTION_REMOVE: - qCWarning(lcEngine) << "restoreOldFiles: RESTORING" << syncItem->_file; - syncItem->_instruction = CSYNC_INSTRUCTION_NEW; - syncItem->_direction = SyncFileItem::Up; + if (syncItem->_type != CSyncEnums::ItemTypeVirtualFile && syncItem->_type != CSyncEnums::ItemTypeVirtualFileDownload) { + qCWarning(lcEngine) << "restoreOldFiles: RESTORING" << syncItem->_file; + syncItem->_instruction = CSYNC_INSTRUCTION_NEW; + syncItem->_direction = SyncFileItem::Up; + } break; case CSYNC_INSTRUCTION_RENAME: case CSYNC_INSTRUCTION_NEW: