Skip to content

bugfix(savegame): Restore the ESC menu after a failed load #3490

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
bobtista wants to merge 3 commits into
base: main
Choose a base branch
from
+6 −0
Draft

bugfix(savegame): Restore the ESC menu after a failed load #3490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6ed606
bugfix(savegame): Clear the loading save flag when a save fails to load
bobtista Oct 11, 2026
ea71544
docs(savegame): Describe the failed load comment by its effect
bobtista Oct 12, 2026
edd87ae
bugfix(savegame): Restore the ESC menu after a failed load (Generals)
bobtista Oct 12, 2026
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: 3 additions & 0 deletions Generals/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,9 @@ SaveCode GameState::loadGame( AvailableGameInfo gameInfo )
TheGameLogic->clearGameData( FALSE );
TheGameEngine->reset();

// TheSuperHackers @bugfix bobtista 11/10/2026 Prevent a failed save load from leaving the quit menu disabled.
TheGameLogic->setLoadingSave( FALSE );

@Caball009 Caball009 Oct 13, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wondering, does it matter if this is done before or after the other stuff in this branch?

@bobtista bobtista Oct 13, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No it doesn't matter. Only the quit menu checks this flag, and clearGameData and the engine reset do not read or change it.


return SC_INVALID_DATA; // you can't use a naked "throw" outside of a catch statement!

}
Expand Down
3 changes: 3 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/System/SaveGame/GameState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,6 +712,9 @@ SaveCode GameState::loadGame( AvailableGameInfo gameInfo )
TheGameLogic->clearGameData( FALSE );
TheGameEngine->reset();

// TheSuperHackers @bugfix bobtista 11/10/2026 Prevent a failed save load from leaving the quit menu disabled.
TheGameLogic->setLoadingSave( FALSE );

return SC_INVALID_DATA; // you can't use a naked "throw" outside of a catch statement!

}
Expand Down
Loading