mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r18598) -Fix [FS#3402]: also cancel the save-pause when loading a savegame as scenario
This commit is contained in:
parent
8d8bd3d45f
commit
c816281e09
|
@ -1023,6 +1023,8 @@ void SwitchToMode(SwitchMode new_mode)
|
||||||
if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR, NO_DIRECTORY)) {
|
if (SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_EDITOR, NO_DIRECTORY)) {
|
||||||
SetLocalCompany(OWNER_NONE);
|
SetLocalCompany(OWNER_NONE);
|
||||||
_settings_newgame.game_creation.starting_year = _cur_year;
|
_settings_newgame.game_creation.starting_year = _cur_year;
|
||||||
|
/* Cancel the saveload pausing */
|
||||||
|
DoCommandP(0, PM_PAUSED_SAVELOAD, 0, CMD_PAUSE);
|
||||||
} else {
|
} else {
|
||||||
SetDParamStr(0, GetSaveLoadErrorString());
|
SetDParamStr(0, GetSaveLoadErrorString());
|
||||||
ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, 0, 0);
|
ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, 0, 0);
|
||||||
|
|
Loading…
Reference in New Issue