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

Unit Create: fixed unit selection not persisting between uses (fixes #2822)

Browse source 
I had been unconditionally selecting the first entry after setting the active
sorting option. This overrode the previous unit selection.

Regression from 6b52d16fae.

(cherry-picked from commit ccce10511a)
This commit is contained in:
Charles Dang 2018-04-08 13:10:35 +11:00
parent 65092a4cfb
commit 6ae7c8e6c2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.md
View file

@ -64,6 +64,7 @@
* Fixed regression where unit filters in [disable] weapon specials would not
match the attacking unit.
* Fixed images with no alpha channel rendering incorrectly.
* Fixed unit selection not persisting between uses of Create Unit.
## Version 1.13.12
### Security fixes

5
src/gui/dialogs/unit_create.cpp
View file

@ -138,7 +138,7 @@ void unit_create::pre_show(window& window)
list.add_row(row_data);
// Select the previous choice, if any.
if(choice_.empty() != true && choice_ == i.first) {
if(!choice_.empty() && choice_ == i.first) {
list.select_last_row();
}
}
@ -151,7 +151,8 @@ void unit_create::pre_show(window& window)
list.register_translatable_sorting_option(0, [this](const int i) { return (*units_[i]).race()->plural_name().str(); });
list.register_translatable_sorting_option(1, [this](const int i) { return (*units_[i]).type_name().str(); });
list.set_active_sorting_option({0, listbox::SORT_ASCENDING}, true);
// Select the first entry on sort if no previous selection was provided.
list.set_active_sorting_option({0, listbox::SORT_ASCENDING}, choice_.empty());
list_item_clicked(window);
}