From c47a679ac91374ae56345c4a7bc6bb455b09d6ed Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 10 Jun 2016 01:39:37 +0200
Subject: [PATCH] Fix queueing of vanity mode toggle (Bug #3421)

---
 apps/openmw/mwrender/camera.cpp | 4 +++-
 apps/openmw/mwrender/camera.hpp | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 92b9553f1..484c44bec 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -56,6 +56,7 @@ namespace MWRender
       mMaxCameraDistance(192.f),
       mDistanceAdjusted(false),
       mVanityToggleQueued(false),
+      mVanityToggleQueuedValue(false),
       mViewModeToggleQueued(false),
       mCameraDistance(0.f)
     {
@@ -150,7 +151,7 @@ namespace MWRender
             // Now process the view changes we queued earlier
             if (mVanityToggleQueued)
             {
-                toggleVanityMode(!mVanity.enabled);
+                toggleVanityMode(mVanityToggleQueuedValue);
                 mVanityToggleQueued = false;
             }
             if (mViewModeToggleQueued)
@@ -205,6 +206,7 @@ namespace MWRender
         if (isFirstPerson() && !mAnimation->upperBodyReady())
         {
             mVanityToggleQueued = true;
+            mVanityToggleQueuedValue = enable;
             return false;
         }
 
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index fab63cd3f..f0e53ebdd 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -52,6 +52,7 @@ namespace MWRender
         bool mDistanceAdjusted;
 
         bool mVanityToggleQueued;
+        bool mVanityToggleQueuedValue;
         bool mViewModeToggleQueued;
 
         float mCameraDistance;