Merge branch '1.14' of github.com:wesnoth/wesnoth into 1.14

This commit is contained in:
Celtic Minstrel 2018-03-24 13:52:00 -04:00
commit 61f7c25a1c

View file

@ -228,6 +228,8 @@ std::pair<wesnothd_connection_ptr, config> open_connection(std::string host)
if(gui2::show_message(_("Warning"), warning_msg, gui2::dialogs::message::yes_no_buttons) != gui2::retval::OK) {
return std::make_pair(wesnothd_connection_ptr(), config());
} else {
continue;
}
}