From bdb03926c29d837bb23ce436a998e10b277a9426 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 25 Jan 2014 16:13:45 +0100
Subject: [PATCH] Fix crash when loading another game after dying

---
 apps/openmw/mwworld/worldimp.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index e5138eaea3..076fcfdb66 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1783,6 +1783,12 @@ namespace MWWorld
     void World::renderPlayer()
     {
         mRendering->renderPlayer(mPlayer->getPlayer());
+
+        // At this point the Animation object is live, and the CharacterController associated with it must be created.
+        // It has to be done at this point: resetCamera below does animation->setViewMode -> CharacterController::forceStateUpdate
+        // so we should make sure not to use a "stale" controller for that.
+        MWBase::Environment::get().getMechanicsManager()->add(mPlayer->getPlayer());
+
         mPhysics->addActor(mPlayer->getPlayer());
         mRendering->resetCamera();
     }