From 09b9066899b2955f859f5ec9d2d425aea9d6b6f0 Mon Sep 17 00:00:00 2001 From: MrS-ibra Date: Thu, 26 Mar 2026 06:49:43 +0300 Subject: [PATCH] bugfix(quickmatch): Fix cancel button remaining disabled after returning from a match --- .../GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp | 1 + .../GeneralsOnline/OnlineServices_SocialInterface.cpp | 3 --- 2 files changed, 1 insertion(+), 3 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 ad3fcecb1c3..0f796b4bc7d 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLQuickMatchMenu.cpp @@ -979,6 +979,7 @@ void WOLQuickMatchMenuInit( WindowLayout *layout, void *userData ) // QM is not going yet, so disable the Widen Search button buttonWiden->winEnable( FALSE ); buttonStop->winHide( TRUE ); + buttonStop->winEnable(TRUE); buttonStart->winHide( FALSE ); GadgetListBoxReset(quickmatchTextWindow); enableOptionsGadgets(TRUE); diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_SocialInterface.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_SocialInterface.cpp index 88f73228d21..79636321948 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_SocialInterface.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_SocialInterface.cpp @@ -407,8 +407,6 @@ void NGMP_OnlineServices_SocialInterface::CommitLobbyPlayerListToRecentlyPlayedW m_mapRecentlyPlayedWith.clear(); - if (TheNGMPGame != nullptr) - { if (TheNGMPGame != nullptr) { for (Int i = 0; i < MAX_SLOTS; ++i) @@ -433,7 +431,6 @@ void NGMP_OnlineServices_SocialInterface::CommitLobbyPlayerListToRecentlyPlayedW } } } - } m_RecentlyPlayedWithTimestamp = std::chrono::duration_cast(std::chrono::utc_clock::now().time_since_epoch()).count(); }