summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-07-15 04:57:20 +0300
committerAndrei Karas <akaras@inbox.ru>2011-07-15 04:57:20 +0300
commit676adcda69d383b923ed8de1f0411746ae5f7080 (patch)
tree29b5f21e408696ea9eea7afb7ebd3b1083ab103b /src
parentea86df6407e6d3e21644f97202ee751b8f87107e (diff)
downloadplus-676adcda69d383b923ed8de1f0411746ae5f7080.tar.gz
plus-676adcda69d383b923ed8de1f0411746ae5f7080.tar.bz2
plus-676adcda69d383b923ed8de1f0411746ae5f7080.tar.xz
plus-676adcda69d383b923ed8de1f0411746ae5f7080.zip
Fix crash with opened other player equipment window.
Also fix possible crash with selected pickup target.
Diffstat (limited to 'src')
-rw-r--r--src/actorspritemanager.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index b6a8a5b4c..61534c340 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -610,9 +610,13 @@ void ActorSpriteManager::logic()
void ActorSpriteManager::clear()
{
+ if (beingEquipmentWindow)
+ beingEquipmentWindow->setBeing(0);
+
if (player_node)
{
player_node->setTarget(0);
+ player_node->unSetPickUpTarget();
mActors.erase(player_node);
}