From 6584a01d01190ed9d2bccc6ebdc4ab6dd87f07fa Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 18 Jan 2014 14:53:25 +0100
Subject: [PATCH] reset reference to player NPC record during cleanup

---
 apps/openmw/mwworld/worldimp.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 8edba0892..9704239d7 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -276,15 +276,16 @@ namespace MWWorld
 
         mWorldScene->changeToVoid();
 
+        mStore.clearDynamic();
+        mStore.setUp();
+
         if (mPlayer)
         {
             mPlayer->setCell (0);
             mPlayer->getPlayer().getRefData() = RefData();
+            mPlayer->set (mStore.get<ESM::NPC>().find ("player"));
         }
 
-        mStore.clearDynamic();
-        mStore.setUp();
-
         mCells.clear();
 
         mProjectiles.clear();