0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash in GUI2 multiplayer tests

Browse source
This commit is contained in:
Jyrki Vesterinen 2016-09-09 21:46:40 +03:00
parent adc598b388
commit 3366e9c683
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/dialogs/lobby/lobby.cpp
View file

@ -820,14 +820,6 @@ void tlobby_main::pre_show(twindow& window)
set_allow_plugin_skip(false);
plugins_context_.reset(new plugins_context("Multiplayer Lobby"));
auto get_game_index_from_id = [this](const int game_id)->int {
if(game_info* game = lobby_info_.get_game_by_id(game_id)) {
return std::find(lobby_info_.games().begin(), lobby_info_.games().end(), game) - lobby_info_.games().begin();
}
return -1;
};
plugins_context_->set_callback("join", [&, this](const config&) {
if(do_game_join(get_game_index_from_id(selected_game_id_), false)) {
legacy_result_ = JOIN;
@ -1204,4 +1196,13 @@ void tlobby_main::send_to_server(const config& cfg)
wesnothd_connection_.send_data(cfg);
}
int tlobby_main::get_game_index_from_id(const int game_id) const
{
if (game_info* game = lobby_info_.get_game_by_id(game_id)) {
return std::find(lobby_info_.games().begin(), lobby_info_.games().end(), game) - lobby_info_.games().begin();
}
return -1;
}
} // namespace gui2

2
src/gui/dialogs/lobby/lobby.hpp
View file

@ -172,6 +172,8 @@ private:
static bool logout_prompt();
int get_game_index_from_id(const int game_id) const;
/** Inherited from tdialog, implemented by REGISTER_DIALOG. */
virtual const std::string& window_id() const override;