Skip to content

fix(ui): load game HUD overlay bug on macOS #233

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

Draft
fbraz3 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −1
Draft

fix(ui): load game HUD overlay bug on macOS #233

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupSaveLoad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,8 @@ static void doLoadGame()
return;

// when loading a game we also close the quit/esc menu for the user when in-game
if( TheShell->isShellActive() == FALSE )
// GeneralsX @bugfix fbraz 22/07/2026 Use isPopup to correctly identify if the load menu was invoked from the in-game popup menu or the main menu shell. TheShell->isShellActive() might have already been mutated to FALSE by a prior call to closeSaveMenu().
if( isPopup )
{
destroyQuitMenu();
// ToggleQuitMenu();
Expand Down
6 changes: 6 additions & 0 deletions docs/WORKLOG/2026-07-DIARY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# July 2026

## 22/07/2026
### Fix Campaign Load HUD Overlay Bug (Issue 221)
- Fixed an issue on macOS (and other platforms) where loading a normal save game from the Main Menu left the HUD overlay and Load/Save window on screen, making the game unplayable.
- Resolved a state race condition in `PopupSaveLoad.cpp`: `doLoadGame()` was checking `TheShell->isShellActive() == FALSE` to determine if the load was triggered from an in-game menu. However, this flag was prematurely cleared by `closeSaveMenu()` when triggered from the Main Menu.
- Replaced the failing check with the static `isPopup` flag, which reliably indicates the origin of the load menu (in-game vs fullscreen shell). This restores the proper `TheGameLogic->prepareNewGame(...)` teardown sequence.

## 17/07/2026
### Fix Non-Deterministic Math in WWMath Matrix Classes
- Traced the cross-platform desync at frame 100 to the `TrainCabUngarrisonable` object's translation matrix diverging between macOS (ARM64) and Linux (x86_64).
Expand Down
Loading