Skip to content

Commit 0942bed

Browse files
authored
[GEN][ZH] Fix crash on GameEngine shutdown when GameLogic::clearGameData() was not called before (#1001)
1 parent 0a1589e commit 0942bed

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Generals/Code/GameEngine/Source/Common/GameEngine.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,10 @@ GameEngine::~GameEngine()
209209

210210
TheGameResultsQueue->endThreads();
211211

212+
// TheSuperHackers @fix helmutbuhler 03/06/2025
213+
// Reset all subsystems before deletion to prevent crashing due to cross dependencies.
214+
reset();
215+
212216
TheSubsystemList->shutdownAll();
213217
delete TheSubsystemList;
214218
TheSubsystemList = NULL;

GeneralsMD/Code/GameEngine/Source/Common/GameEngine.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,10 @@ GameEngine::~GameEngine()
207207

208208
TheGameResultsQueue->endThreads();
209209

210+
// TheSuperHackers @fix helmutbuhler 03/06/2025
211+
// Reset all subsystems before deletion to prevent crashing due to cross dependencies.
212+
reset();
213+
210214
TheSubsystemList->shutdownAll();
211215
delete TheSubsystemList;
212216
TheSubsystemList = NULL;

0 commit comments

Comments
 (0)