From f6c227b966e17325541ac7b9b010da8babb1aceb Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Sat, 23 Sep 2017 23:02:17 +0200
Subject: [PATCH] Reset screen faders in clear()

Fixes a black screen when loading a game while waiting/resting.
---
 apps/openmw/mwgui/screenfader.cpp      | 6 ++++++
 apps/openmw/mwgui/screenfader.hpp      | 2 ++
 apps/openmw/mwgui/windowmanagerimp.cpp | 2 --
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwgui/screenfader.cpp b/apps/openmw/mwgui/screenfader.cpp
index be0346e88..1d04e871e 100644
--- a/apps/openmw/mwgui/screenfader.cpp
+++ b/apps/openmw/mwgui/screenfader.cpp
@@ -119,6 +119,12 @@ namespace MWGui
         queue(time, percent/100.f);
     }
 
+    void ScreenFader::clear()
+    {
+        clearQueue();
+        notifyAlphaChanged(0.f);
+    }
+
     void ScreenFader::setFactor(float factor)
     {
         mFactor = factor;
diff --git a/apps/openmw/mwgui/screenfader.hpp b/apps/openmw/mwgui/screenfader.hpp
index b510e133a..19468de3c 100644
--- a/apps/openmw/mwgui/screenfader.hpp
+++ b/apps/openmw/mwgui/screenfader.hpp
@@ -42,6 +42,8 @@ namespace MWGui
         void fadeOut(const float time);
         void fadeTo(const int percent, const float time);
 
+        void clear();
+
         void setFactor (float factor);
         void setRepeat(bool repeat);
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 906151ab1..29425e7c3 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -1589,8 +1589,6 @@ namespace MWGui
 
         mForceHidden = GW_None;
 
-        setWerewolfOverlay(false);
-
         while (!mGuiModes.empty())
             popGuiMode();