From e343eaff46086df80700ac9e8690caa004ed22f6 Mon Sep 17 00:00:00 2001 From: "seer-by-sentry[bot]" <157164994+seer-by-sentry[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 03:11:03 +0000 Subject: [PATCH] PopupReplay: Add null check before calling closeSaveMenu --- .../Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp | 5 ++++- .../Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp index 5694bd78694..b672cd47c3c 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp @@ -177,7 +177,10 @@ void PopupReplayUpdate( WindowLayout *layout, void *userData ) ShowReplaySavedPopup(FALSE); // close the save/load menu - closeSaveMenu( parent ); + if (parent != NULL) + { + closeSaveMenu( parent ); + } ScoreScreenEnableControls(TRUE); // reset the timer to 0 cause we have to. diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp index 3f0dfd11da0..afa0548ad45 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupReplay.cpp @@ -177,7 +177,10 @@ void PopupReplayUpdate( WindowLayout *layout, void *userData ) ShowReplaySavedPopup(FALSE); // close the save/load menu - closeSaveMenu( parent ); + if (parent != NULL) + { + closeSaveMenu( parent ); + } ScoreScreenEnableControls(TRUE); // reset the timer to 0 cause we have to.