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

Additional checks to see if unit still exists,

Browse source 
...before trying to reset its appearance.  Tentative fix for bug
#19135
This commit is contained in:
Gabriel Morin 2011-12-10 22:54:26 +00:00
parent b69d94ad6c
commit 03f0abb017
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/whiteboard/manager.cpp
View file

@ -306,7 +306,12 @@ void manager::pre_delete_action(action_ptr action)
&& boost::dynamic_pointer_cast<move>(action)
&& viewer_actions()->count_actions_of(action->get_unit()) == 1)
{
action->get_unit()->set_standing(true);
//but first, check that the unit's still around and that it's the same one
unit_map::iterator unit_it =
resources::units->find(boost::static_pointer_cast<move>(action)->get_dest_hex());
if (unit_it != resources::units->end() && &*unit_it == action->get_unit()) {
action->get_unit()->set_standing(true);
}
}
}