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

Fixup cf670b99c6

Browse source 
Caused an assert to trigger by moving this line of code. Moves it back.
This commit is contained in:
Charles Dang 2016-10-23 06:42:33 +11:00
parent cf670b99c6
commit 3683c75968
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/dialogs/multiplayer/mp_options_helper.cpp
View file

@ -188,6 +188,9 @@ void tmp_options_helper::display_custom_options(std::string&& type, const config
std::tie(menu_button, val) = add_node_and_get_widget<tmenu_button>(option_node, "option_menu_button", data, menu_button_option);
// Needs to be called before set_selected
menu_button->set_values(combo_items);
auto iter = std::find_if(items.begin(), items.end(), [&val](const config& cfg) {
return cfg["value"] == val;
});
@ -196,7 +199,6 @@ void tmp_options_helper::display_custom_options(std::string&& type, const config
menu_button->set_selected(iter - items.begin());
}
menu_button->set_values(combo_items);
menu_button->connect_click_handler(
std::bind(&tmp_options_helper::update_options_data_map<tmenu_button>, this, menu_button, visible_options_.back()));
} else if(opt.key == "slider") {