From 9e4d734373a2f1fec146f83353e355551a0845b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Tue, 13 Oct 2026 07:19:55 +0200
Subject: [PATCH] Fix ZeldaZach review for PR 7495: three-way baseHash check
 before conflict

---
 .../interface/deck_sync/deck_sync_manager.cpp  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/cockatrice/src/interface/deck_sync/deck_sync_manager.cpp b/cockatrice/src/interface/deck_sync/deck_sync_manager.cpp
index 566138141..ebed690a0 100644
--- a/cockatrice/src/interface/deck_sync/deck_sync_manager.cpp
+++ b/cockatrice/src/interface/deck_sync/deck_sync_manager.cpp
@@ -372,6 +372,24 @@ void DeckSyncManager::classify(const QMap<QString, ServerFile> &serverFiles)
             ++unchangedCount;
             continue;
         }
+        const DeckSyncRecord baseRecord = sidecar.get(it.key());
+        const bool localChanged = baseRecord.baseHash.isEmpty() || baseRecord.baseHash != it.value().hash;
+        const bool serverChanged = baseRecord.baseHash.isEmpty() || baseRecord.baseHash != serverIt.value().hash;
+        if (localChanged && !serverChanged) {
+            if (syncMode == DeckSyncMode::DownloadOnly) {
+                continue;
+            }
+            applyUpload(it.key(), serverPath, serverIt.value().id, serverIt.value().guid);
+            continue;
+        }
+        if (!localChanged && serverChanged) {
+            if (syncMode == DeckSyncMode::UploadOnly) {
+                continue;
+            }
+            applyDownload(it.key(), serverIt.value().id, serverIt.value().guid, serverIt.value().hash,
+                          serverIt.value().lastModifiedSecs);
+            continue;
+        }
         const qint64 localSecs = it.value().modified.toSecsSinceEpoch();
         const int effective = sessionDefault >= 0 ? sessionDefault : conflictDefault;
         // A server row without last_modified predates sync: the local file wins.