Mercurial > hg > openttd

changeset 15295:ca9ec6c98491 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r19934) -Fix [FS#3857]: When 'pause on new game' is set, pause the game before CleanupGeneration() to avoid conflicts with concurrent GUI code.
author frosch <frosch@openttd.org>
date Sat, 05 Jun 2010 15:22:46 +0000
parents c3d64c33d3d4
children b4822d9955c3
files src/genworld.cpp src/openttd.cpp
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -184,7 +184,6 @@
 		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);
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -820,6 +820,8 @@
 	}
 #endif /* ENABLE_NETWORK */
 
+	if (_settings_client.gui.pause_on_newgame) DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
+
 	MarkWholeScreenDirty();
 }