From 160c43fad14a9e1a68632cbaaf3092a1b5c21404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= <Bruebach.Lukas@bdosecurity.de>
Date: Mon, 15 Jun 2026 00:52:28 +0200
Subject: [PATCH] Guard differently.

Took 2 minutes
---
 cockatrice/src/game_graphics/player/menu/player_menu.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/cockatrice/src/game_graphics/player/menu/player_menu.cpp b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
index 8c8891840..9d7a0bdbe 100644
--- a/cockatrice/src/game_graphics/player/menu/player_menu.cpp
+++ b/cockatrice/src/game_graphics/player/menu/player_menu.cpp
@@ -76,15 +76,12 @@ QMenu *PlayerMenu::updateCardMenu(const CardState *card)
         return nullptr;
     }
 
-    if (!player->getLogic()->getGame()->getActiveCard()) {
-        return nullptr;
-    }
-
     // If is spectator (as spectators don't need card menus), return
     // only update the menu if the card is actually selected
+    auto *activeCard = player->getLogic()->getGame()->getActiveCard();
     if ((player->getLogic()->getGame()->getPlayerManager()->isSpectator() &&
          !player->getLogic()->getGame()->getPlayerManager()->isJudge()) ||
-        player->getLogic()->getGame()->getActiveCard()->getState() != card) {
+        !activeCard || activeCard->getState() != card) {
         return nullptr;
     }