summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Src/Android/ButtonManager.cpp
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2013-12-12 21:24:39 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2013-12-12 21:24:39 -0600
commit2e1aa64958ec767180e8a592cb51e5caa8db92b8 (patch)
tree804ed896cbd25ba9b4e3200be4855887b6cbee88 /Source/Core/DolphinWX/Src/Android/ButtonManager.cpp
parentd7be993889245c913f8da5183182b340c04a087b (diff)
[Android] Fix joysticks only capable of right/down movements. Also make it capable of using onscreen joystick even if controller 1 is bound.
Diffstat (limited to 'Source/Core/DolphinWX/Src/Android/ButtonManager.cpp')
-rw-r--r--Source/Core/DolphinWX/Src/Android/ButtonManager.cpp2
1 files changed, 1 insertions, 1 deletions
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)
{