diff --git a/client/lobby/CLobbyScreen.cpp b/client/lobby/CLobbyScreen.cpp index fcaba8307..585f43a73 100644 --- a/client/lobby/CLobbyScreen.cpp +++ b/client/lobby/CLobbyScreen.cpp @@ -50,7 +50,7 @@ CLobbyScreen::CLobbyScreen(ESelectionScreen screenType) buttonSelect->addCallback([=]() { toggleTab(tabSel); - if (getMapInfo()->isRandomMap) + if (getMapInfo() && getMapInfo()->isRandomMap) CSH->setMapInfo(tabSel->getSelectedMapInfo()); }); @@ -78,7 +78,7 @@ CLobbyScreen::CLobbyScreen(ESelectionScreen screenType) buttonRMG->addCallback([this]() { toggleTab(tabRand); - if (!getMapInfo()->isRandomMap) + if (getMapInfo() && !getMapInfo()->isRandomMap) tabRand->updateMapInfoByHost(); });