From 257a584971ba9e8e2b1516244cf8fef75f15231a Mon Sep 17 00:00:00 2001
From: Mmonge123 <mouragoat1750@gmail.com>
Date: Sat, 7 Nov 2026 16:38:33 +0000
Subject: [PATCH] fix: keep only the roll-die shortcut active in the lobby
 (#6754)

Player menu shortcuts were bound as soon as a local player was added in the deck-selection lobby. Defer full activation until GameMetaInfo reports the game has started, and bind only Player/aRollDie while in the lobby. Counters follow the deactivation signal, so they cannot re-enable shortcuts before the game starts.
---
 .../game_graphics/player/menu/player_menu.cpp | 31 +++++++++++++++++++
 .../game_graphics/player/menu/player_menu.h   | 11 +++++--
 .../player/menu/utility_menu.cpp              |  9 ++++++
 .../game_graphics/player/menu/utility_menu.h  |  3 ++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
index 582586ac2..27949356f 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
@@ -23,6 +23,7 @@
 #include <QMenu>
 #include <QString>
 #include <libcockatrice/game/abstract_game.h>
+#include <libcockatrice/game/game_meta_info.h>
 #include <libcockatrice/game/player/player_info.h>
 #include <libcockatrice/game/player/player_logic.h>
 #include <libcockatrice/game/player/player_manager.h>
@@ -70,6 +71,11 @@ PlayerMenu::PlayerMenu(PlayerGraphicsItem *_player) : QObject(_player), player(_
 
     connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this,
             &PlayerMenu::refreshShortcuts);
+
+    // Re-evaluate shortcuts when the game starts or ends, so the lobby only exposes the roll-die shortcut.
+    connect(player->getLogic()->getGame()->getGameMetaInfo(), &GameMetaInfo::startedChanged, this,
+            &PlayerMenu::refreshShortcuts);
+
     refreshShortcuts();
 
     retranslateUi();
@@ -144,6 +150,12 @@ void PlayerMenu::refreshShortcuts()
 void PlayerMenu::setShortcutsActive()
 {
     shortcutsActive = true;
+
+    if (!isGameStarted()) {
+        applyLobbyShortcuts();
+        return;
+    }
+
     for (auto *c : managedComponents) {
         c->setShortcutsActive();
     }
@@ -156,5 +168,24 @@ void PlayerMenu::setShortcutsInactive()
     for (auto *c : managedComponents) {
         c->setShortcutsInactive();
     }
+    emit shortcutsDeactivated();
+}
+
+bool PlayerMenu::isGameStarted() const
+{
+    return player->getLogic()->getGame()->getGameMetaInfo()->started();
+}
+
+void PlayerMenu::applyLobbyShortcuts()
+{
+    // Everything stays unbound until the game starts; only the roll-die shortcut is usable in the lobby.
+    for (auto *c : managedComponents) {
+        c->setShortcutsInactive();
+    }
+
+    if (utilityMenu) {
+        utilityMenu->setLobbyShortcutsActive();
+    }
+
     emit shortcutsDeactivated();
 }
\ No newline at end of file
diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.h b/cockatrice/src/game_graphics/player/menu/player_menu.h
index e21a689de..56de3c918 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.h
@@ -73,17 +73,24 @@ public:
         return utilityMenu;
     }
 
+    /** @brief Whether this player currently holds its shortcuts and the game has started. */
     [[nodiscard]] bool getShortcutsActive() const
     {
-        return shortcutsActive;
+        return shortcutsActive && isGameStarted();
     }
 
-    /** @brief Bind keyboard shortcuts. Called when this player gains focus. */
+    /** @brief Bind keyboard shortcuts. Only the roll-die shortcut is bound before the game starts. */
     void setShortcutsActive();
     /** @brief Unbind keyboard shortcuts. Called when this player loses focus. */
     void setShortcutsInactive();
 
 private:
+    /** @brief True once the game has started; false while players are still in the deck-selection lobby. */
+    [[nodiscard]] bool isGameStarted() const;
+
+    /** @brief Unbinds everything except the shortcuts that remain usable before the game starts. */
+    void applyLobbyShortcuts();
+
     PlayerGraphicsItem *player;
     TearOffMenu *playerMenu;
     QMenu *countersMenu;
diff --git a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
index 3b8affff5..249fc57e6 100644
--- a/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/utility_menu.cpp
@@ -150,4 +150,13 @@ void UtilityMenu::setShortcutsInactive()
         aCreateAnotherToken->setShortcut(QKeySequence());
         aIncrementAllCardCounters->setShortcut(QKeySequence());
     }
+}
+
+void UtilityMenu::setLobbyShortcutsActive()
+{
+    if (!player->getLogic()->getPlayerInfo()->getLocalOrJudge()) {
+        return;
+    }
+
+    aRollDie->setShortcuts(SettingsCache::instance().shortcuts().getShortcut("Player/aRollDie"));
 }
\ No newline at end of file
diff --git a/cockatrice/src/game_graphics/player/menu/utility_menu.h b/cockatrice/src/game_graphics/player/menu/utility_menu.h
index 009e4aca3..625c7aa62 100644
--- a/cockatrice/src/game_graphics/player/menu/utility_menu.h
+++ b/cockatrice/src/game_graphics/player/menu/utility_menu.h
@@ -32,6 +32,9 @@ public slots:
 public:
     explicit UtilityMenu(PlayerGraphicsItem *player, QMenu *playerMenu);
 
+    /** @brief Binds only the shortcuts that remain usable before the game starts. */
+    void setLobbyShortcutsActive();
+
     [[nodiscard]] bool createAnotherTokenActionExists() const
     {
         return aCreateAnotherToken != nullptr;