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

Use index 0 when current theme is not found

Browse source 
Trying to open the preferences dialog when a theme from an addon was selected that is not currently in use asserts in menu_button::set_values.
This commit is contained in:
Gunter Labes 2023-12-08 20:01:22 +01:00
parent 7c219ab9a4
commit ff8d4d063f
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gui/dialogs/preferences_dialog.cpp
View file

@ -159,15 +159,14 @@ void preferences_dialog::set_theme_list(menu_button& theme_list)
themes_ = theme::get_basic_theme_info();
std::vector<config> options;
for(const auto& theme : themes_) {
options.emplace_back("label", theme.name, "tooltip", theme.description);
std::size_t current_theme = 0;
for(std::size_t i = 0; i < themes_.size(); ++i) {
options.emplace_back("label", themes_[i].name, "tooltip", themes_[i].description);
if(themes_[i].id == preferences::theme()) {
current_theme = i;
}
}
const unsigned current_theme = std::distance(themes_.begin(),
std::find_if(themes_.begin(), themes_.end(), [](const auto& theme) {
return theme.id == preferences::theme();
}));
theme_list.set_values(options, current_theme);
}