jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-07 18:43:26 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[DeckSync] Address conflict review nits: enum class and designated initializers

Browse source
This commit is contained in:
Lukas Brübach 2026-11-06 09:31:10 +01:00
parent dd6c8423e6
commit 7ea4c36e98
4 changed files with 38 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp
View file

@ -583,15 +583,16 @@ void TabDeckStorage::onConflictRequest(const DeckSyncConflict &conflict)
DlgSyncConflict dialog(conflict, this);
if (dialog.exec() != QDialog::Accepted) {
DeckSyncResolution skip;
skip.action = DeckSyncSkipConflict;
skip.action = DeckSyncResolutionAction::SkipConflict;
syncManager->resolveConflict(skip);
return;
}
const DeckSyncResolution resolution = dialog.resolution();
if (resolution.rememberAlways &&
(resolution.action == DeckSyncKeepMine || resolution.action == DeckSyncKeepServer)) {
SettingsCache::instance().deckSync().setConflictDefault(
resolution.action == DeckSyncKeepMine ? DeckSyncConflictKeepMine : DeckSyncConflictKeepServer);
if (resolution.rememberAlways && (resolution.action == DeckSyncResolutionAction::KeepMine ||
resolution.action == DeckSyncResolutionAction::KeepServer)) {
SettingsCache::instance().deckSync().setConflictDefault(resolution.action == DeckSyncResolutionAction::KeepMine
? DeckSyncConflictKeepMine
: DeckSyncConflictKeepServer);
}
syncManager->resolveConflict(resolution);
}