summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-02-12 16:35:33 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-02-12 16:35:33 +0100
commit657a46c434e71e8c97d1872b9f33fb4299582cb0 (patch)
tree9215c051b4e0079984a7fd2b1928b945bf28ff71 /platform
parentde6d6633ec96ee90afb3074be79c0ad6055ec8eb (diff)
parent1fb9cc377fe05a6f631a9fcb306aa4f9d2e23b79 (diff)
Merge pull request #3691 from Hinsbart/fix_xinput_triggers
fix xinput triggers not resetting correctly
Diffstat (limited to 'platform')
-rw-r--r--platform/windows/joystick.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/windows/joystick.cpp b/platform/windows/joystick.cpp
index f4fb09820f..f8526b5ec1 100644
--- a/platform/windows/joystick.cpp
+++ b/platform/windows/joystick.cpp
@@ -472,7 +472,7 @@ InputDefault::JoyAxis joystick_windows::axis_correct(int p_val, bool p_xinput, b
InputDefault::JoyAxis jx;
if (Math::abs(p_val) < MIN_JOY_AXIS) {
- jx.min = -1;
+ jx.min = p_trigger ? 0 : -1;
jx.value = 0.0f;
return jx;
}