mirror of https://github.com/OpenTTD/OpenTTD
(svn r19934) -Fix [FS#3857]: When 'pause on new game' is set, pause the game before CleanupGeneration() to avoid conflicts with concurrent GUI code.
parent
9e53f1e004
commit
c5921a91ea
|
@ -184,7 +184,6 @@ static void _GenerateWorld(void *)
|
|||
if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game");
|
||||
DEBUG(desync, 1, "new_map: %08x", _settings_game.game_creation.generation_seed);
|
||||
|
||||
if (_settings_client.gui.pause_on_newgame && _game_mode == GM_NORMAL) DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
|
||||
if (_debug_desync_level > 0) {
|
||||
char name[MAX_PATH];
|
||||
snprintf(name, lengthof(name), "dmp_cmds_%08x_%08x.sav", _settings_game.game_creation.generation_seed, _date);
|
||||
|
|
|
@ -820,6 +820,8 @@ static void MakeNewGameDone()
|
|||
}
|
||||
#endif /* ENABLE_NETWORK */
|
||||
|
||||
if (_settings_client.gui.pause_on_newgame) DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
|
||||
|
||||
MarkWholeScreenDirty();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue