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

Add guard clause needed...

Browse source 
...to prevent the code for preserving changed titles across a
set_resolution() call from damaging the editor display.
This commit is contained in:
Eric S. Raymond 2007-11-27 08:34:05 +00:00
parent a35eef9135
commit 0fa7406fc0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/theme.cpp
View file

@ -535,7 +535,7 @@ bool theme::set_resolution(const SDL_Rect& screen)
std::map<std::string,std::string> title_stash;
for (std::vector<theme::menu>::iterator m = menus_.begin(); m != menus_.end(); ++m) {
if (!m->title().empty())
if (!m->title().empty() && !m->get_id().empty())
title_stash[m->get_id()] = m->title();
}
@ -655,7 +655,7 @@ void theme::set_object_location(theme::object& element, std::string rect_str, st
void theme::modify(const config* cfg){
std::map<std::string,std::string> title_stash;
for (std::vector<theme::menu>::iterator m = menus_.begin(); m != menus_.end(); ++m) {
if (!m->title().empty())
if (!m->title().empty() && !m->get_id().empty())
title_stash[m->get_id()] = m->title();
}