Merge branch 'master' of https://github.com/wesnoth/wesnoth

wesnoth · Apr 21, 2014 · 774b0ec · 774b0ec
2 parents 600f56f + c1dcd46
commit 774b0ec
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/playcampaign.cpp b/src/playcampaign.cpp
@@ -625,7 +625,7 @@ LEVEL_RESULT play_game(game_display& disp, game_state& gamestate,
 					connect_engine(new mp::connect_engine(disp, gamestate,
 						params, !network_game, false));
 
-				if (allow_new_game_flag || game_config::debug) {
+				if (allow_new_game_flag || (game_config::debug && network::nconnections() == 0)) {
 					// Opens mp::connect dialog to allow users to
 					// make an adjustments for scenario.
 					mp::ui::result connect_res = mp::goto_mp_connect(disp,