fix loading screen when loading mp config.

wesnoth · Mar 30, 2016 · 6910083 · 6910083
1 parent c3bf0ee
commit 6910083
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/game_config_manager.cpp b/src/game_config_manager.cpp
@@ -560,7 +560,7 @@ void game_config_manager::load_game_config_for_create(bool is_mp)
 
 	typedef boost::shared_ptr<game_config::scoped_preproc_define> define;
 	try{
-		load_game_config(NO_INCLUDE_RELOAD);
+		load_game_config_with_loadscreen(NO_INCLUDE_RELOAD);
 	}
 	catch(game::error&) {
 		cache_.clear_defines();
@@ -572,7 +572,7 @@ void game_config_manager::load_game_config_for_create(bool is_mp)
 			previous_defines.push_back(new_define);
 		}
 
-		load_game_config(NO_FORCE_RELOAD);
+		load_game_config_with_loadscreen(NO_FORCE_RELOAD);
 
 		throw;
 	}

diff --git a/src/game_initialization/multiplayer_ui.cpp b/src/game_initialization/multiplayer_ui.cpp
@@ -19,6 +19,7 @@
 #include "game_preferences.hpp"
 #include "gettext.hpp"
 #include "gui/dialogs/multiplayer/mp_cmd_wrapper.hpp"
+#include "gui/dialogs/loadscreen.hpp"
 #include "lobby_preferences.hpp"
 #include "log.hpp"
 #include "marked-up_text.hpp"
@@ -309,6 +310,9 @@ void ui::process_event()
 
 void ui::handle_event(const SDL_Event& event)
 {
+	if (gui2::tloadscreen::displaying()) {
+		return;
+	}
 	gui::widget::handle_event(event);
 
 	if (event.type == SDL_WINDOWEVENT && event.window.event == SDL_WINDOWEVENT_RESIZED) {