From 0240a6c38b3b62ea35ed84ce0b2903a89b8b1115 Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Wed, 27 Sep 2017 21:30:12 +0200
Subject: [PATCH] Fix controls window regression

---
 apps/openmw/mwinput/inputmanagerimp.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 0637b6d837..e6acbbd522 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -697,7 +697,7 @@ namespace MWInput
             SDL_StopTextInput();
 
         bool consumed = false;
-        if (kc != OIS::KC_UNASSIGNED)
+        if (kc != OIS::KC_UNASSIGNED && !mInputBinder->detectingBindingState())
         {
             consumed = MWBase::Environment::get().getWindowManager()->injectKeyPress(MyGUI::KeyCode::Enum(kc), 0);
             if (SDL_IsTextInputActive() &&  // Little trick to check if key is printable
@@ -726,7 +726,8 @@ namespace MWInput
         mJoystickLastUsed = false;
         OIS::KeyCode kc = mInputManager->sdl2OISKeyCode(arg.keysym.sym);
 
-        setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyRelease(MyGUI::KeyCode::Enum(kc)));
+        if (!mInputBinder->detectingBindingState())
+            setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyRelease(MyGUI::KeyCode::Enum(kc)));
         mInputBinder->keyReleased (arg);
     }