From 5f32892e750a6df167d8d71311a3d6fb6e565f75 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Wed, 12 May 2021 15:51:56 +0200 Subject: [PATCH] check if player is null when updating card menu (#4346) --- cockatrice/src/tab_game.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp index cbcc3ac1..a598b3c1 100644 --- a/cockatrice/src/tab_game.cpp +++ b/cockatrice/src/tab_game.cpp @@ -1412,12 +1412,15 @@ Player *TabGame::getActiveLocalPlayer() const void TabGame::updateCardMenu(AbstractCardItem *card) { - Player *p; - if ((clients.size() > 1) || !players.contains(localPlayerId)) - p = card->getOwner(); - else - p = players.value(localPlayerId); - p->updateCardMenu(static_cast(card)); + Player *player; + if ((clients.size() > 1) || !players.contains(localPlayerId)) { + player = card->getOwner(); + } else { + player = players.value(localPlayerId); + } + if (player != nullptr) { + player->updateCardMenu(static_cast(card)); + } } void TabGame::createMenuItems()