Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action (Fixes #1960)

apps/openmw/mwinput/inputmanagerimp.cpp

@@ -936,9 +936,11 @@ namespace MWInput
             {
                 clearAllBindings (control);
 
-                if (defaultKeyBindings.find(i) != defaultKeyBindings.end())
+                if (defaultKeyBindings.find(i) != defaultKeyBindings.end()
+                        && !mInputBinder->isKeyBound(defaultKeyBindings[i]))
                     mInputBinder->addKeyBinding(control, defaultKeyBindings[i], ICS::Control::INCREASE);
-                else if (defaultMouseButtonBindings.find(i) != defaultMouseButtonBindings.end())
+                else if (defaultMouseButtonBindings.find(i) != defaultMouseButtonBindings.end()
+                         && !mInputBinder->isMouseButtonBound(defaultMouseButtonBindings[i]))
                     mInputBinder->addMouseButtonBinding (control, defaultMouseButtonBindings[i], ICS::Control::INCREASE);
             }
         }

extern/oics/ICSInputControlSystem.h

@@ -119,9 +119,11 @@ namespace ICS
         //bool sliderMoved(const OIS::JoyStickEvent &evt, int index);
 
         void addKeyBinding(Control* control, SDL_Scancode key, Control::ControlChangingDirection direction);
+        bool isKeyBound(SDL_Scancode key) const;
 		void addMouseAxisBinding(Control* control, NamedAxis axis, Control::ControlChangingDirection direction);
 		void addMouseButtonBinding(Control* control, unsigned int button, Control::ControlChangingDirection direction);
-		void addJoystickAxisBinding(Control* control, int deviceId, int axis, Control::ControlChangingDirection direction);
+        bool isMouseButtonBound(unsigned int button) const;
+        void addJoystickAxisBinding(Control* control, int deviceId, int axis, Control::ControlChangingDirection direction);
 		void addJoystickButtonBinding(Control* control, int deviceId, unsigned int button, Control::ControlChangingDirection direction);
 		void addJoystickPOVBinding(Control* control, int deviceId, int index, POVAxis axis, Control::ControlChangingDirection direction);
 		void addJoystickSliderBinding(Control* control, int deviceId, int index, Control::ControlChangingDirection direction);

extern/oics/ICSInputControlSystem_keyboard.cpp

@@ -61,6 +61,11 @@ namespace ICS
 		mControlsKeyBinderMap[ key ] = controlKeyBinderItem;
 	}
 
+    bool InputControlSystem::isKeyBound(SDL_Scancode key) const
+    {
+        return mControlsKeyBinderMap.find(key) != mControlsKeyBinderMap.end();
+    }
+
     void InputControlSystem::removeKeyBinding(SDL_Scancode key)
 	{
 		ControlsKeyBinderMapType::iterator it = mControlsKeyBinderMap.find(key);

extern/oics/ICSInputControlSystem_mouse.cpp

@@ -139,6 +139,11 @@ namespace ICS
 		mControlsMouseButtonBinderMap[ button ] = controlMouseButtonBinderItem;
 	}
 
+	bool InputControlSystem::isMouseButtonBound(unsigned int button) const
+	{
+		return mControlsMouseButtonBinderMap.find(button) != mControlsMouseButtonBinderMap.end();
+	}
+
 	// get bindings
 	InputControlSystem::NamedAxis InputControlSystem::getMouseAxisBinding(Control* control, ICS::Control::ControlChangingDirection direction)
 	{