Vfs: Remove old db record when dehydrating via rename

For #7338

1 files changed, 8 insertions, 4 deletions

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 97a5e9aca..8472b819d 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -720,8 +720,10 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
                 if (dbEntry._modtime == localEntry.modtime && dbEntry._fileSize == localEntry.size) {
                     qCInfo(lcDisco) << "Base file was renamed to virtual file:" << item->_file;
                     item->_direction = SyncFileItem::Down;
-                    item->_instruction = CSYNC_INSTRUCTION_NEW;
-                    item->_type = ItemTypeVirtualFile;
+                    item->_instruction = CSYNC_INSTRUCTION_SYNC;
+                    item->_type = ItemTypeVirtualFileDehydration;
+                    addVirtualFileSuffix(item->_file);
+                    item->_renameTarget = item->_file;
                 } else {
                     qCInfo(lcDisco) << "Virtual file with non-virtual db entry, ignoring:" << item->_file;
                     item->_instruction = CSYNC_INSTRUCTION_IGNORE;
@@ -1058,8 +1060,10 @@ void ProcessDirectoryJob::processFileFinalize(
         }
         if (item->_type == ItemTypeVirtualFileDehydration
             && item->_instruction == CSYNC_INSTRUCTION_SYNC) {
-            item->_renameTarget = item->_file;
-            addVirtualFileSuffix(item->_renameTarget);
+            if (item->_renameTarget.isEmpty()) {
+                item->_renameTarget = item->_file;
+                addVirtualFileSuffix(item->_renameTarget);
+            }
         }
     }