(svn r15246) -Fix [FS#2577]: close all windows *before* starting a new game/loading a game instead of doing that as one of the latest steps of loading the game. This caused, in some cases, the NewGRF settings to be reset when the game was already loaded resulting in instant desyncs when joining a network game

1 files changed, 5 insertions, 0 deletions

diff --git a/src/misc.cpp b/src/misc.cpp
index cdd48c293..daa437b6f 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -30,6 +30,7 @@
 #include "tilehighlight_func.h"
 #include "core/bitmath_func.hpp"
 #include "network/network_func.h"
+#include "window_func.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
@@ -60,6 +61,10 @@ void InitializeOldNames();
 
 void InitializeGame(uint size_x, uint size_y, bool reset_date)
 {
+	/* Make sure there isn't any window that can influence anything
+	 * related to the new game we're about to start/load. */
+	UnInitWindowSystem();
+
 	AllocateMap(size_x, size_y);
 
 	SetObjectToPlace(SPR_CURSOR_ZZZ, PAL_NONE, VHM_NONE, WC_MAIN_WINDOW, 0);