From 84e0732fb1207722186366d2e595677331de3a7a Mon Sep 17 00:00:00 2001
From: RickyRister <42636155+RickyRister@users.noreply.github.com>
Date: Fri, 14 Nov 2025 06:29:05 -0800
Subject: [PATCH] Fix crash when changing shortcut in game (#6318)

---
 cockatrice/src/game/board/abstract_counter.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp
index 8ca593ace..985c78ad2 100644
--- 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());