From 85c9d8a9ff5dd6db13a9c45d3bfe74c406c3b01d Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Mon, 5 Jan 2026 01:18:38 -0800 Subject: [PATCH] [DeckEditor] Fix tokens being added to maindeck (#6495) --- .../widgets/deck_editor/deck_editor_deck_dock_widget.cpp | 3 +-- .../interface/widgets/deck_editor/deck_state_manager.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 014f121e4..afc1f41b2 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -597,13 +597,12 @@ QModelIndexList DeckEditorDeckDockWidget::getSelectedCardNodeSourceIndices() con return selectedRows; } -void DeckEditorDeckDockWidget::actAddCard(const ExactCard &card, const QString &_zoneName) +void DeckEditorDeckDockWidget::actAddCard(const ExactCard &card, const QString &zoneName) { if (!card) { return; } - QString zoneName = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : _zoneName; deckStateManager->addCard(card, zoneName); } diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp index 628d33d51..7b99e8c6a 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp @@ -174,11 +174,13 @@ QModelIndex DeckStateManager::addCard(const ExactCard &card, const QString &zone return {}; } + QString zone = card.getInfo().getIsToken() ? DECK_ZONE_TOKENS : zoneName; + QString reason = tr("Added (%1): %2 (%3) %4") - .arg(zoneName, card.getName(), card.getPrinting().getSet()->getCorrectedShortName(), + .arg(zone, card.getName(), card.getPrinting().getSet()->getCorrectedShortName(), card.getPrinting().getProperty("num")); - QModelIndex idx = modifyDeck(reason, [&card, &zoneName](auto model) { return model->addCard(card, zoneName); }); + QModelIndex idx = modifyDeck(reason, [&card, &zone](auto model) { return model->addCard(card, zone); }); if (idx.isValid()) { emit focusIndexChanged(idx);