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

Fix crash.

Browse source
This commit is contained in:
Tommy Schmitz 2011-08-19 20:58:49 +00:00
parent 2960d98c19
commit cd698eddaf
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/whiteboard/side_actions.cpp
View file

@ -124,14 +124,10 @@ void side_actions::get_numbers(const map_location& hex, numbers_t& result)
bool side_actions::execute_next()
{
if (!actions_.front().empty())
{
if(!empty() && !actions_.front().empty())
return execute(begin());
}
else
{
else //nothing is executable right now
return false;
}
}
void side_actions::execute_all()
@ -154,7 +150,7 @@ void side_actions::execute_all()
{
iterator position = begin();
bool finished = execute(position);
keep_executing = finished && !actions_.front().empty();
keep_executing = finished && !empty() && !actions_.front().empty();
}
}