From 5b011e43a7a30f6d428f095031f4593e968b1f8b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 23 Apr 2014 19:49:09 +0200
Subject: [PATCH] Fix a crash after loading game

---
 apps/openmw/mwgui/hud.cpp              | 8 +++++++-
 apps/openmw/mwgui/hud.hpp              | 1 +
 apps/openmw/mwgui/windowmanagerimp.cpp | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 06a228a1fb..02cc5c6a90 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -52,7 +52,7 @@ namespace MWGui
         , mWeaponVisible(true)
         , mSpellVisible(true)
         , mWorldMouseOver(false)
-        , mEnemyHealthTimer(0)
+        , mEnemyHealthTimer(-1)
         , mIsDrowning(false)
         , mWeaponSpellTimer(0.f)
         , mDrowningFlashTheta(0.f)
@@ -639,4 +639,10 @@ namespace MWGui
         updateEnemyHealthBar();
     }
 
+    void HUD::resetEnemy()
+    {
+        mEnemy = MWWorld::Ptr();
+        mEnemyHealthTimer = -1;
+    }
+
 }
diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp
index 1645d8db01..38535630fb 100644
--- a/apps/openmw/mwgui/hud.hpp
+++ b/apps/openmw/mwgui/hud.hpp
@@ -56,6 +56,7 @@ namespace MWGui
         void update();
 
         void setEnemy(const MWWorld::Ptr& enemy);
+        void resetEnemy();
 
     private:
         MyGUI::ProgressBar *mHealth, *mMagicka, *mStamina, *mEnemyHealth, *mDrowning;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index db19070a6e..2b98408765 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -289,6 +289,10 @@ namespace MWGui
 
     void WindowManager::setNewGame(bool newgame)
     {
+        // This method will always be called after loading a savegame or starting a new game
+        // Reset enemy, it could be a dangling pointer from a previous game
+        mHud->resetEnemy();
+
         if (newgame)
         {
             disallowAll();