Merge pull request #368 from Infomaniak/Fix-merge-issue-in-KDESKTOP-1226

Fix fusion issue.
Infomaniak · Nov 1, 2024 · 3f45823 · 3f45823
2 parents 17d8d57 + af02cd9
commit 3f45823
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/libsyncengine/propagation/executor/executorworker.cpp b/src/libsyncengine/propagation/executor/executorworker.cpp
@@ -1884,15 +1884,12 @@ ExitInfo ExecutorWorker::propagateConflictToDbAndTree(SyncOpPtr syncOp, bool &pr
                         syncOp->conflict().localNode()->previousId().has_value() ? *syncOp->conflict().localNode()->previousId()
                         : syncOp->conflict().localNode()->id().has_value()       ? *syncOp->conflict().localNode()->id()
                                                                                  : std::string();
-                if (ExitInfo exitInfo = deleteFromDb(syncOp->conflict().localNode()); !exitInfo) {
-                    if (localNodeFoundInDb) {
+                _syncPal->_syncDb->dbId(ReplicaSide::Local, effectiveNodeId, dbId, localNodeFoundInDb);
+                if (localNodeFoundInDb) {
+                    if (ExitInfo exitInfo = deleteFromDb(syncOp->conflict().localNode()); !exitInfo) {
                         // Remove local node from DB
-                        if (!deleteFromDb(syncOp->conflict().localNode())) {
-                            // _executorExitCode and _executorExitCause are set by
-                            // the above function
-                            propagateChange = false;
-                            return exitInfo;
-                        }
+                        propagateChange = false;
+                        return exitInfo;
                     }
                 }