From 378fcc246078a3273180b91e5574c3ec8e821e43 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Thu, 9 Aug 2012 11:10:18 +0400
Subject: [PATCH] fix DisablePlayerControl logic

---
 apps/openmw/mwinput/inputmanager.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanager.cpp b/apps/openmw/mwinput/inputmanager.cpp
index ea279cfdf..4281612f0 100644
--- a/apps/openmw/mwinput/inputmanager.cpp
+++ b/apps/openmw/mwinput/inputmanager.cpp
@@ -399,14 +399,14 @@ private:
             }
             else
                 player.setForwardBackward (0);
-        }
 
-        if (poller.isDown(A_Jump) && mControlSwitch["playerjumping"])
-            player.setUpDown (1);
-        else if (poller.isDown(A_Crouch))
-            player.setUpDown (-1);
-        else
-            player.setUpDown (0);
+            if (poller.isDown(A_Jump) && mControlSwitch["playerjumping"])
+                player.setUpDown (1);
+            else if (poller.isDown(A_Crouch))
+                player.setUpDown (-1);
+            else
+                player.setUpDown (0);
+        }
     }
 
     // Switch between gui modes. Besides controlling the Gui windows
@@ -444,6 +444,7 @@ private:
             player.setLeftRight(0);
             player.setForwardBackward(0);
             player.setAutoMove(false);
+            player.setUpDown(0);
         } else if (sw == "playerjumping" && !value) {
             /// \fixme maybe crouching at this time
             player.setUpDown(0);