From 923b23976802d17805abc198fe57d14cb3cca5f1 Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Sun, 5 Oct 2025 02:48:14 +0000
Subject: [PATCH] QuickMatch: Add null check for TheNGMPGame before accessing
 it

---
 .../GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
index 3d526978365..2d84d9ff4c0 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
@@ -1143,6 +1143,13 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 			{
 				NetworkLog(ELogVerbosity::LOG_DEBUG, "[QUICKMATCH] GOT START GAME EVENT");
 
+				// Check if TheNGMPGame is initialized before dereferencing it
+				if (!TheNGMPGame)
+				{
+					NetworkLog(ELogVerbosity::LOG_DEBUG, "[QUICKMATCH] NO NGMP GAME INSTANCE");
+					return;
+				}
+
 				// mark everyone as having the map, we dont allow user provided custom maps or map transfers in QM
 				// TODO_QUICKMATCH: Do this automatically for game type quickmatch, or better yet, do it on the service
 				for (int i = 0; i < MAX_SLOTS; i++)
@@ -1164,12 +1171,6 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
 					return;
 				}
 
-				if (!TheNGMPGame)
-				{
-					NetworkLog(ELogVerbosity::LOG_DEBUG, "[QUICKMATCH] NO NGMP GAME INSTANCE");
-					return;
-				}
-
 
 				// TODO_NGMP
 				//SendStatsToOtherPlayers(TheNGMPGame);