From 4ac8b0427b8f322840dbfdee4175deb48745e1c9 Mon Sep 17 00:00:00 2001 From: "seer-by-sentry[bot]" <157164994+seer-by-sentry[bot]@users.noreply.github.com> Date: Thu, 7 May 2026 21:33:44 +0000 Subject: [PATCH] bugfix(gui): Correct index usage in LanGameOptionsMenu for player info retrieval --- .../GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 4 ++-- .../GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index f1805eb6704..6f2c14b5964 100644 --- a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -196,14 +196,14 @@ static void playerTooltip(GameWindow *window, if (idx == -1) return; - LANGameSlot *slot = TheLAN->GetMyGame()->getLANSlot(i); + LANGameSlot *slot = TheLAN->GetMyGame()->getLANSlot(idx); if (!slot) return; LANPlayer *player = slot->getUser(); if (!player) { - DEBUG_ASSERTCRASH(TheLAN->GetMyGame()->getIP(i) == 0, ("No player info in listbox!")); + DEBUG_ASSERTCRASH(TheLAN->GetMyGame()->getIP(idx) == 0, ("No player info in listbox!")); TheMouse->setCursorTooltip( UnicodeString::TheEmptyString ); return; } diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp index 4072ce98ad5..3866e6a1671 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp @@ -203,14 +203,14 @@ static void playerTooltip(GameWindow *window, if (idx == -1) return; - LANGameSlot *slot = TheLAN->GetMyGame()->getLANSlot(i); + LANGameSlot *slot = TheLAN->GetMyGame()->getLANSlot(idx); if (!slot) return; LANPlayer *player = slot->getUser(); if (!player) { - DEBUG_ASSERTCRASH(TheLAN->GetMyGame()->getIP(i) == 0, ("No player info in listbox!")); + DEBUG_ASSERTCRASH(TheLAN->GetMyGame()->getIP(idx) == 0, ("No player info in listbox!")); TheMouse->setCursorTooltip( UnicodeString::TheEmptyString ); return; }