From 2e1aa64958ec767180e8a592cb51e5caa8db92b8 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 12 Dec 2013 21:24:39 -0600 Subject: [Android] Fix joysticks only capable of right/down movements. Also make it capable of using onscreen joystick even if controller 1 is bound. --- Source/Core/DolphinWX/Src/Android/ButtonManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/Src/Android/ButtonManager.cpp') diff --git a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp index 8ab83a3346..f3127678fa 100644 --- a/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp +++ b/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp @@ -140,7 +140,7 @@ namespace ButtonManager auto it = m_controllers.begin(); if (it == m_controllers.end()) return value; - return it->second->AxisValue(padID, axis); + return value != 0.0f ? value : it->second->AxisValue(padID, axis); } void TouchEvent(int padID, ButtonType button, int action) { -- cgit v1.2.3