Fix crash when changing shortcut in game (#6318)

2026-04-24 07:09:19 -05:00 · 2025-11-14 06:29:05 -08:00 · 2025-11-14 06:29:05 -08:00 · 84e0732fb1
commit 84e0732fb1
parent ae123587d7
1 changed files with 8 additions and 0 deletions
--- a/cockatrice/src/game/board/abstract_counter.cpp
+++ b/cockatrice/src/game/board/abstract_counter.cpp
@ -85,9 +85,13 @@ void AbstractCounter::retranslateUi()

 void AbstractCounter::setShortcutsActive()
 {
+    if (!menu) {
+        return;
+    }
    if (!player->getPlayerInfo()->getLocal()) {
        return;
    }
+
    ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts();
    if (name == "life") {
        shortcutActive = true;
@ -104,6 +108,10 @@ void AbstractCounter::setShortcutsActive()

 void AbstractCounter::setShortcutsInactive()
 {
+    if (!menu) {
+        return;
+    }
+
    shortcutActive = false;
    if (name == "life" || useNameForShortcut) {
        aSet->setShortcut(QKeySequence());