Skip to content

Commit 4864ee6

Browse files
authored
Merge pull request #59 from GeneralsOnlineDevelopmentTeam/seer/popup-replay-null-check
PopupReplay: Add null check before calling closeSaveMenu
2 parents 740888d + e343eaf commit 4864ee6

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

  • GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus
  • Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus

Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,10 @@ void PopupReplayUpdate( WindowLayout *layout, void *userData )
177177
ShowReplaySavedPopup(FALSE);
178178

179179
// close the save/load menu
180-
closeSaveMenu( parent );
180+
if (parent != NULL)
181+
{
182+
closeSaveMenu( parent );
183+
}
181184
ScoreScreenEnableControls(TRUE);
182185

183186
// reset the timer to 0 cause we have to.

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,10 @@ void PopupReplayUpdate( WindowLayout *layout, void *userData )
177177
ShowReplaySavedPopup(FALSE);
178178

179179
// close the save/load menu
180-
closeSaveMenu( parent );
180+
if (parent != NULL)
181+
{
182+
closeSaveMenu( parent );
183+
}
181184
ScoreScreenEnableControls(TRUE);
182185

183186
// reset the timer to 0 cause we have to.

0 commit comments

Comments
 (0)