From 8fd961bbac29bddb7bc838c7ed29e4268ed340c7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 31 Mar 2013 15:50:48 +0200
Subject: [PATCH] Fix ReferenceInterface not resetting the Ptr after it was
 deleted, causing onReferenceUnavailable to be called every frame. Fix
 inputmanager hiding the cursor when it shouldn't.

---
 apps/openmw/mwgui/referenceinterface.cpp |  3 +++
 apps/openmw/mwinput/inputmanagerimp.cpp  | 25 +++++-------------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/apps/openmw/mwgui/referenceinterface.cpp b/apps/openmw/mwgui/referenceinterface.cpp
index b1f7affb6f..66e036d929 100644
--- a/apps/openmw/mwgui/referenceinterface.cpp
+++ b/apps/openmw/mwgui/referenceinterface.cpp
@@ -26,7 +26,10 @@ namespace MWGui
         // check if player has changed cell, or count of the reference has become 0
         if ((playerCell != mCurrentPlayerCell && mCurrentPlayerCell != NULL)
             || mPtr.getRefData().getCount() == 0)
+        {
+            mPtr = MWWorld::Ptr();
             onReferenceUnavailable();
+        }
 
         mCurrentPlayerCell = playerCell;
     }
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 33ab9b1b40..e514638bb4 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -372,26 +372,11 @@ namespace MWInput
     void InputManager::changeInputMode(bool guiMode)
     {
         MWBase::Environment::get().getWindowManager()->setMouseVisible(guiMode);
-        if(guiMode)
-        {
-            // Disable mouse look
-            mMouseLookEnabled = false;
-
-            mWindows.showCrosshair (false);
-
-            // Enable GUI events
-            mGuiCursorEnabled = true;
-        }
-        else
-        {
-            // Enable mouse look
-            mMouseLookEnabled = true;
-
-            mWindows.showCrosshair (false);
-
-            // Disable GUI events
-            mGuiCursorEnabled = false;
-        }
+        mGuiCursorEnabled = guiMode;
+        mMouseLookEnabled = !guiMode;
+        if (guiMode)
+            mWindows.showCrosshair(false);
+        // if not in gui mode, the camera decides whether to show crosshair or not.
     }
 
     void InputManager::processChangedSettings(const Settings::CategorySettingVector& changed)