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; }