From 3042a9da7331e7908faaea50112c6e59ffbcd19c Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 3 Jul 2014 19:37:12 +0200
Subject: [PATCH] Cancel queued view mode switch when switching view mode
 (Fixes #1618)

---
 apps/openmw/mwrender/camera.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 9e683cc159..4580bae70b 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -149,6 +149,8 @@ namespace MWRender
             mViewModeToggleQueued = true;
             return;
         }
+        else
+            mViewModeToggleQueued = false;
 
         mFirstPersonView = !mFirstPersonView;
         processViewChange();