Author: tschmitz
Date: Fri Aug 19 22:58:49 2011
New Revision: 50858
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50858&view=rev
Log:
Fix crash.
Modified:
trunk/src/whiteboard/side_actions.cpp
Modified: trunk/src/whiteboard/side_actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/side_actions.cpp?rev=50858&r1=50857&r2=50858&view=diff
==============================================================================
--- trunk/src/whiteboard/side_actions.cpp (original)
+++ trunk/src/whiteboard/side_actions.cpp Fri Aug 19 22:58:49 2011
@@ -124,14 +124,10 @@
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 @@
{
iterator position = begin();
bool finished = execute(position);
- keep_executing = finished && !actions_.front().empty();
+ keep_executing = finished && !empty() &&
!actions_.front().empty();
}
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
