Skip to content

Commit 33acdb0

Browse files
bugfix(loadscreen): Prevent null pointer dereference when accessing game slot
1 parent 6266009 commit 33acdb0

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

Core/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1986,7 +1986,8 @@ void MapTransferLoadScreen::init( GameInfo *game )
19861986
GadgetStaticTextSetText(m_progressText[netSlot], UnicodeString::TheEmptyString );
19871987
m_progressText[netSlot]->winSetEnabledTextColors(houseColor, m_progressText[netSlot]->winGetEnabledTextBorderColor());
19881988

1989-
if ((i == 0 || (TheGameInfo->getConstSlot(i)->isHuman() && TheGameInfo->getConstSlot(i)->hasMap())) && m_progressBars[netSlot])
1989+
const GameSlot *gameInfoSlot = TheGameInfo->getConstSlot(i);
1990+
if ((i == 0 || (gameInfoSlot && gameInfoSlot->isHuman() && gameInfoSlot->hasMap())) && m_progressBars[netSlot])
19901991
m_progressBars[netSlot]->winHide(TRUE);
19911992

19921993
m_playerLookup[i] = netSlot; // save our mapping so we can update progress correctly

0 commit comments

Comments
 (0)