From 222defc6d873f1cb9cc93abeff939ed77e442e6d Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sat, 23 Sep 2017 23:09:41 +0200
Subject: [PATCH] Extend HUD::clear()

---
 apps/openmw/mwgui/hud.cpp              | 7 +++++++
 apps/openmw/mwgui/hud.hpp              | 2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp | 9 ++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 87c1b2f3c..779e358d3 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -632,6 +632,13 @@ namespace MWGui
         mEnemyHealthTimer = -1;
     }
 
+    void HUD::clear()
+    {
+        unsetSelectedSpell();
+        unsetSelectedWeapon();
+        resetEnemy();
+    }
+
     void HUD::customMarkerCreated(MyGUI::Widget *marker)
     {
         marker->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMapClicked);
diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp
index fc335d1e7..3542f3ebf 100644
--- a/apps/openmw/mwgui/hud.hpp
+++ b/apps/openmw/mwgui/hud.hpp
@@ -58,7 +58,7 @@ namespace MWGui
         void setEnemy(const MWWorld::Ptr& enemy);
         void resetEnemy();
 
-        void clear() { resetEnemy(); }
+        void clear();
 
     private:
         MyGUI::ProgressBar *mHealth, *mMagicka, *mStamina, *mEnemyHealth, *mDrowning;
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 29425e7c3..2cfafd0a2 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -506,16 +506,9 @@ namespace MWGui
             disallowAll();
             delete mCharGen;
             mCharGen = new CharacterCreation(mViewer->getSceneData()->asGroup(), mResourceSystem);
-            mGuiModes.clear();
-            MWBase::Environment::get().getInputManager()->changeInputMode(false);
-            mHud->unsetSelectedWeapon();
-            mHud->unsetSelectedSpell();
-            unsetForceHide(GW_ALL);
         }
         else
             allow(GW_ALL);
-
-        mRestAllowed = !newgame;
     }
 
     WindowManager::~WindowManager()
@@ -1338,6 +1331,7 @@ namespace MWGui
     void WindowManager::disallowAll()
     {
         mAllowed = GW_None;
+        mRestAllowed = false;
 
         mBookWindow->setInventoryAllowed (false);
         mScrollWindow->setInventoryAllowed (false);
@@ -1588,6 +1582,7 @@ namespace MWGui
         mCustomMarkers.clear();
 
         mForceHidden = GW_None;
+        mRestAllowed = true;
 
         while (!mGuiModes.empty())
             popGuiMode();