[GEN][ZH] Fix crash on GameEngine shutdown when GameLogic::clearGameData() was not called before #1001
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xezon
reviewed
Jun 3, 2025
xezon
left a comment
xezon
left a comment
There was a problem hiding this comment.
Nice. Needs to be relicated in Generals.
How often does this crash occur in Replays?
Author
Happens for every replay. |
|
Ah ok so this only happens when exiting the game during a match, which cannot happen in the regular client, but only with Debug features. |
xezon
added
Debug
Author
|
Can only happen with the new Replay Simulation |
Author
|
Updated comment and synced with Generals |
helmutbuhler
changed the title
xezon
changed the title
fbraz3
pushed a commit
to fbraz3/GeneralsX
that referenced
this pull request
Nov 10, 2025
…ata() was not called before (TheSuperHackers#1001)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #995
This fixes a crash when shutting down the GameEngine without calling
TheGameEngine->reset()first. This happens during Replay Simulation (see #923).During normal shutdown in the existing game this cannot happen because shutdown only occurs with the
GameMessage::MSG_CLEAR_GAME_DATAmessage, which callsGameLogic::clearGameData, which in turn callsTheGameEngine->reset()Why does it crash otherwise?
GameEngine has (among others) two subsystems:
TeamFactoryandPlayerList, which it initializes in that order. During shutdown (in opposite order)~TeamFactory()calls~TeamPrototype(), which calls~Team(), which callsThePlayerList->getPlayerCount()(which then will crash because the PlayerList is already destructed).Resetting first fixes this because it clears all the team prototypes in the TeamFactory.
Changing the order of
TeamFactoryandPlayerListwould probably not work because some other dependency would then likely show up. It also would be a scary change that could break other things. I think resetting first is a valid approach to fix these dependencies and to make sure shutdown always works properly.