mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17537) -Fix: don't crash while printing gamelog in crash handler if we crashed before while gamelog action was active

release/1.0
smatz 2009-09-14 19:30:13 +00:00
parent 8deb7efcc7
commit d6f4cda74e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/crashlog.cpp
View File

@ -211,9 +211,7 @@ bool CrashLog::WriteSavegame(char *filename, const char *filename_last) const
if (_m == NULL) return false; if (_m == NULL) return false;
try { try {
GamelogStartAction(GLAT_EMERGENCY);
GamelogEmergency(); GamelogEmergency();
GamelogStopAction();
seprintf(filename, filename_last, "%scrash.sav", _personal_dir); seprintf(filename, filename_last, "%scrash.sav", _personal_dir);

5
src/gamelog.cpp
View File

@ -334,8 +334,11 @@ static LoggedChange *GamelogChange(GamelogChangeType ct)
*/ */
void GamelogEmergency() void GamelogEmergency()
{ {
assert(_gamelog_action_type == GLAT_EMERGENCY); /* Terminate any active action */
if (_gamelog_action_type != GLAT_NONE) GamelogStopAction();
GamelogStartAction(GLAT_EMERGENCY);
GamelogChange(GLCT_EMERGENCY); GamelogChange(GLCT_EMERGENCY);
GamelogStopAction();
} }
/** Finds out if current game is a loaded emergency savegame. /** Finds out if current game is a loaded emergency savegame.