From 8d17565efdacfc6d627b4f4cad2166e20c4f7e9b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 25 Jun 2017 14:43:56 +0200
Subject: [PATCH] Fix joystick binding for an action being discarded when
 default for another action is loaded (Bug #3900)

---
 apps/openmw/mwinput/inputmanagerimp.cpp        |  7 ++++---
 extern/oics/ICSInputControlSystem.h            |  2 ++
 extern/oics/ICSInputControlSystem_joystick.cpp | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 73e0c6d300..283147ca94 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -1243,7 +1243,7 @@ namespace MWInput
             if (!controlExists)
             {
                 float initial;
-                if (defaultButtonBindings.find(i) != defaultButtonBindings.end())
+                if (defaultAxisBindings.find(i) == defaultAxisBindings.end())
                     initial = 0.0f;
                 else initial = 0.5f;
                 control = new ICS::Control(std::to_string(i), false, true, initial, ICS::ICS_MAX, ICS::ICS_MAX);
@@ -1259,12 +1259,13 @@ namespace MWInput
             {
                 clearAllControllerBindings(control);
 
-                if (defaultButtonBindings.find(i) != defaultButtonBindings.end())
+                if (defaultButtonBindings.find(i) != defaultButtonBindings.end()
+                        && !mInputBinder->isJoystickButtonBound(mFakeDeviceID, defaultButtonBindings[i]))
                 {
                     control->setInitialValue(0.0f);
                     mInputBinder->addJoystickButtonBinding(control, mFakeDeviceID, defaultButtonBindings[i], ICS::Control::INCREASE);
                 }
-                else if (defaultAxisBindings.find(i) != defaultAxisBindings.end())
+                else if (defaultAxisBindings.find(i) != defaultAxisBindings.end() && !mInputBinder->isJoystickAxisBound(mFakeDeviceID, defaultAxisBindings[i]))
                 {
                     control->setValue(0.5f);
                     control->setInitialValue(0.5f);
diff --git a/extern/oics/ICSInputControlSystem.h b/extern/oics/ICSInputControlSystem.h
index 308b54c3b1..0e8e6ecadb 100644
--- a/extern/oics/ICSInputControlSystem.h
+++ b/extern/oics/ICSInputControlSystem.h
@@ -120,6 +120,8 @@ namespace ICS
         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);
+		bool isJoystickButtonBound(int deviceID, unsigned int button) const;
+		bool isJoystickAxisBound(int deviceID, unsigned int axis) const;
         void removeKeyBinding(SDL_Scancode key);
 		void removeMouseAxisBinding(NamedAxis axis);
 		void removeMouseButtonBinding(unsigned int button);
diff --git a/extern/oics/ICSInputControlSystem_joystick.cpp b/extern/oics/ICSInputControlSystem_joystick.cpp
index 5beaf27c4a..ed6e2f6647 100644
--- a/extern/oics/ICSInputControlSystem_joystick.cpp
+++ b/extern/oics/ICSInputControlSystem_joystick.cpp
@@ -110,6 +110,24 @@ namespace ICS
 		mControlsJoystickButtonBinderMap[deviceID][button] = controlJoystickButtonBinderItem;
 	}
 
+	bool InputControlSystem::isJoystickButtonBound(int deviceID, unsigned int button) const
+	{
+		JoystickButtonBinderMapType::const_iterator found = mControlsJoystickButtonBinderMap.find(deviceID);
+		if (found == mControlsJoystickButtonBinderMap.end())
+			return false;
+
+		return (found->second.find(button) != found->second.end());
+	}
+
+	bool InputControlSystem::isJoystickAxisBound(int deviceID, unsigned int axis) const
+	{
+		JoystickAxisBinderMapType::const_iterator found = mControlsJoystickAxisBinderMap.find(deviceID);
+		if (found == mControlsJoystickAxisBinderMap.end())
+			return false;
+
+		return (found->second.find(axis) != found->second.end());
+	}
+
 	// get bindings
 	int InputControlSystem::getJoystickAxisBinding(Control* control, int deviceID, ICS::Control::ControlChangingDirection direction)
 	{