Skip to content

fix: Handle QuickMatch game start callback not being received after lobby creation #529

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

Open
MrS-ibra wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Handle QuickMatch game start callback not being received after lobby creation #529

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
14 changes: 14 additions & 0 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 @@ -151,6 +151,9 @@ static Int maxPingEntries = 0;
static Int maxPoints= 100;
static Int minPoints = 0;

static Int matchFoundTimeoutStart = 0;
static const Int lobbyTimeoutMs = 10000;

static const LadderInfo * getLadderInfo();

static Bool isInfoShown()
Expand Down Expand Up @@ -1214,6 +1217,7 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )
{
buttonBack->winEnable(FALSE);
buttonStop->winEnable(FALSE);
matchFoundTimeoutStart = timeGetTime();
if (TheAudio)
{
AudioEventRTS evt("GUICommunicatorOpen");
Expand All @@ -1223,6 +1227,7 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData )

pLobbyInterface->RegisterForMatchmakingStartGameCallback([]()
{
matchFoundTimeoutStart = 0;
NetworkLog(ELogVerbosity::LOG_DEBUG, "[QUICKMATCH] GOT START GAME EVENT");

// Check if TheNGMPGame is initialized before dereferencing it
Expand Down Expand Up @@ -1571,6 +1576,15 @@ void WOLQuickMatchMenuUpdate( WindowLayout * layout, void *userData)
HandleBuddyResponses();
#endif

if (matchFoundTimeoutStart != 0 && timeGetTime() - matchFoundTimeoutStart >= lobbyTimeoutMs)
{
matchFoundTimeoutStart = 0;
buttonBack->winEnable(TRUE);
buttonStop->winEnable(TRUE);
Int index = GadgetListBoxAddEntryText(quickmatchTextWindow, UnicodeString(L"Match setup timed out. You may cancel or continue waiting."), GameMakeColor(255, 194, 25, 255), -1, -1);
GadgetListBoxSetItemData(quickmatchTextWindow, (void*)-1, index);
}

/// @todo: MDC handle disconnects in-game the same way as Custom Match!

if (TheShell->isAnimFinished() && !buttonPushed && TheGameSpyPeerMessageQueue && TheGameSpyInfo)
Expand Down
Loading