From 5eb0f489e20e0102fa57b77fbabadd7fe5828d69 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 27 Nov 2012 18:39:12 +0100
Subject: [PATCH] Issue 476: fixed auto-move bypassing disabled player controls

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index af30c9b04..6a1c3aa9b 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -624,7 +624,9 @@ namespace MWInput
     void InputManager::toggleAutoMove()
     {
         if (mWindows.isGuiMode()) return;
-        mPlayer.setAutoMove (!mPlayer.getAutoMove());
+
+        if (mControlSwitch["playercontrols"])
+            mPlayer.setAutoMove (!mPlayer.getAutoMove());
     }
 
     void InputManager::toggleWalking()