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

Schema: Fix [elseif] requiring an [then] tag

Browse source 
While a lack of [then] here generally isn't desirable, a crash is far worse.
This commit is contained in:
Celtic Minstrel 2018-03-29 21:06:37 -04:00
parent d369368ac3
commit ac3ddf6e52
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/serialization/tag.cpp
View file

@ -562,7 +562,7 @@ void class_tag::add_filter(const config& cond_cfg)
else_filter.add_child("not", elseif_filter);
// Ensure it won't match for any of the preceding cases, either
elseif_filter.append_children(old_else_filter);
conditions_.emplace_back(elseif_cfg.child("then"), elseif_filter);
conditions_.emplace_back(elseif_cfg.child_or_empty("then"), elseif_filter);
const std::string name = formatter() << get_name() << "[elseif " << i++ << "]";
conditions_.back().set_name(name);
}