Skip to content

QuickMatch: Add null check for TheNGMPGame before accessing it #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
x64-dev merged 1 commit into from
Oct 10, 2025
Merged

QuickMatch: Add null check for TheNGMPGame before accessing it #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
Expand All @@ -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);
Expand Down
Loading