From 2df73eca6b4832beee9acd632c1b0037886de2ae Mon Sep 17 00:00:00 2001 From: "seer-by-sentry[bot]" <157164994+seer-by-sentry[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2026 00:23:38 +0000 Subject: [PATCH] bugfix(lanlobby): Prevent crash when TheLAN is null in mouse event handler --- .../Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp | 3 +++ .../Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp index 9283219f788..cda4a1dd313 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp @@ -332,6 +332,9 @@ static void playerTooltip(GameWindow *window, WinInstanceData *instData, UnsignedInt mouse) { + if (!TheLAN) + return; + Int x, y, row, col; x = LOLONGTOSHORT(mouse); y = HILONGTOSHORT(mouse); diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp index 2f395f73891..5e4304abc1f 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanLobbyMenu.cpp @@ -332,6 +332,9 @@ static void playerTooltip(GameWindow *window, WinInstanceData *instData, UnsignedInt mouse) { + if (!TheLAN) + return; + Int x, y, row, col; x = LOLONGTOSHORT(mouse); y = HILONGTOSHORT(mouse);