(svn r19388) -Fix [FS#3666]: [NoAI] When reloading a savegame, an AI failing to compile could trigger (trying) to read the not yet loaded information of another AI via the AI Debug window and its "open with the most recently used AI" feature

2 files changed, 10 insertions, 0 deletions

diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index beeed22bc..c7ff796d9 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -1016,3 +1016,11 @@ void ShowAIDebugWindow(CompanyID show_company)
 		ShowErrorMessage(STR_ERROR_AI_DEBUG_SERVER_ONLY, INVALID_STRING_ID, WL_INFO);
 	}
 }
+
+/**
+ * Reset the AI windows to their initial state.
+ */
+void InitializeAIGui()
+{
+	AIDebugWindow::ai_debug_company = INVALID_COMPANY;
+}
diff --git a/src/misc.cpp b/src/misc.cpp
index 995f0dd5e..7ec606b5a 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -41,6 +41,7 @@ void InitializeRailGui();
 void InitializeRoadGui();
 void InitializeAirportGui();
 void InitializeDockGui();
+void InitializeAIGui();
 void InitializeIndustries();
 void InitializeTowns();
 void InitializeSubsidies();
@@ -92,6 +93,7 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
 	InitializeRoadGui();
 	InitializeAirportGui();
 	InitializeDockGui();
+	InitializeAIGui();
 	InitializeTowns();
 	InitializeSubsidies();
 	InitializeTrees();