(svn r18598) -Fix [FS#3402]: also cancel the save-pause when loading a savegame as scenario

This commit is contained in:
rubidium 2009-12-22 08:34:40 +00:00
parent 8d8bd3d45f
commit c816281e09
1 changed files with 2 additions and 0 deletions

View File

@ -1023,6 +1023,8 @@ void SwitchToMode(SwitchMode new_mode)
if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR, NO_DIRECTORY)) {
SetLocalCompany(OWNER_NONE);
_settings_newgame.game_creation.starting_year = _cur_year;
/* Cancel the saveload pausing */
DoCommandP(0, PM_PAUSED_SAVELOAD, 0, CMD_PAUSE);
} else {
SetDParamStr(0, GetSaveLoadErrorString());
ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, 0, 0);