Reset AI manager singleton pointer when exiting the game (fixes #2523)

wesnoth · Feb 20, 2018 · 5b89aaf · 5b89aaf
1 parent 1ab31bf
commit 5b89aaf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/ai/manager.hpp b/src/ai/manager.hpp
@@ -556,6 +556,7 @@ class manager
 	ai_composite& get_active_ai_for_side( side_number side );
 
 
+	friend class game_launcher;
 };
 
 } //end of namespace ai
diff --git a/src/game_launcher.cpp b/src/game_launcher.cpp
@@ -15,6 +15,7 @@
 #include "game_launcher.hpp"
 #include "game_errors.hpp"
 
+#include "ai/manager.hpp"               // for manager
 #include "preferences/credentials.hpp"
 #include "commandline_options.hpp"      // for commandline_options
 #include "config.hpp"                   // for config, etc
@@ -959,6 +960,7 @@ void game_launcher::launch_game(RELOAD_GAME_DATA reload)
 	try {
 		campaign_controller ccontroller(state_, game_config_manager::get()->game_config(), game_config_manager::get()->terrain_types());
 		LEVEL_RESULT result = ccontroller.play_game();
+		ai::manager::singleton_ = nullptr;
 		// don't show The End for multiplayer scenario
 		// change this if MP campaigns are implemented
 		if(result == LEVEL_RESULT::VICTORY && !state_.classification().is_normal_mp_game()) {