From 6262d6c9644b5459078126b389dc218db8eb680a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Jul 2014 23:10:58 +0200
Subject: [PATCH] Don't leave stale player CharacterController in Actors when
 loading game (Fixes #1713)

---
 apps/openmw/mwmechanics/actors.cpp | 14 ++++++++------
 apps/openmw/mwworld/worldimp.cpp   |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 36397ac09..a215a71a3 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -924,12 +924,7 @@ namespace MWMechanics
 
     Actors::~Actors()
     {
-      PtrControllerMap::iterator it(mActors.begin());
-      for (; it != mActors.end(); ++it)
-      {
-        delete it->second;
-        it->second = NULL;
-      }
+        clear();
     }
 
     void Actors::addActor (const MWWorld::Ptr& ptr, bool updateImmediately)
@@ -1359,6 +1354,13 @@ namespace MWMechanics
 
     void Actors::clear()
     {
+        PtrControllerMap::iterator it(mActors.begin());
+        for (; it != mActors.end(); ++it)
+        {
+            delete it->second;
+            it->second = NULL;
+        }
+        mActors.clear();
         mDeathCount.clear();
     }
 }
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 10c2e4974..14746526b 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2111,8 +2111,8 @@ namespace MWWorld
     void World::enableActorCollision(const MWWorld::Ptr& actor, bool enable)
     {
         OEngine::Physic::PhysicActor *physicActor = mPhysEngine->getCharacter(actor.getRefData().getHandle());
-
-        physicActor->enableCollisionBody(enable);
+        if (physicActor)
+            physicActor->enableCollisionBody(enable);
     }
 
     bool World::findInteriorPosition(const std::string &name, ESM::Position &pos)