jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-10 20:13:24 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Apply suggestion from @ZeldaZach

Browse source 
Co-authored-by: Zach H <zahalpern+github@gmail.com>
This commit is contained in:
BruebachL 2026-11-08 19:12:42 +01:00 • committed by Lukas Brübach
parent b611e8ea6f
commit b10abad3a3
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/interface/deck_sync/deck_sync_manager.cpp
View file

@ -666,6 +666,13 @@ void DeckSyncManager::handleConflictDownload(const QString &relativePath, const
processNext(); processNext();
return; return;
} }
if (serverDeck.getContentHash() == localFiles.value(relativePath).hash) {
// Same deck, the row just predates hashes: upload once so the server stamps
// hash and last_modified instead of asking about identical content.
applyUpload(relativePath, ctx.serverPath, ctx.deckId, ctx.guid);
processNext();
return;
}
DeckSyncSidecar sidecar(sidecarPath); DeckSyncSidecar sidecar(sidecarPath);
sidecar.load(); sidecar.load();