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

attempt to fix issue #1820

Browse source 
`iter->get("description")` might return nullptr so. Also contains some small cleanups.
This commit is contained in:
gfgtdf 2017-07-11 00:51:07 +02:00 • committed by GitHub
parent 003508d5ef
commit b68a23c480
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gui/dialogs/unit_advance.cpp
View file

@ -78,14 +78,13 @@ void unit_advance::pre_show(window& window)
// This checks if we've finished iterating over the last unit type advancements
// and are into the modification-based advancements.
if(i >= last_real_advancement_) {
auto iter = sample.get_modifications().child_range("advancement").end();
iter--;
const auto& back = sample.get_modifications().child_range("advancement").back();
if(iter->has_attribute("image")) {
image_string = iter->get("image")->str();
if(back.has_attribute("image")) {
image_string = back["image"].str();
}
name = iter->get("description")->str();
name = back["description"].str();
}
if(image_string.empty()) {