diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2016-06-20 11:09:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-20 11:09:52 +0200 |
commit | a1a57bc369de01cbb2295b403d84ec5fac210020 (patch) | |
tree | 0365d28314ca230c283f5d630f8e5584c29dcfa2 /platform/x11 | |
parent | d4359b2d09625695a972a40ce76faf90b38f4e59 (diff) | |
parent | 5d950728795cdc9cc6ea3c40e29b38d3dc43b709 (diff) |
Merge pull request #5309 from nounoursheureux/master
Fix the joystick vibration on Linux
Diffstat (limited to 'platform/x11')
-rw-r--r-- | platform/x11/joystick_linux.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/platform/x11/joystick_linux.cpp b/platform/x11/joystick_linux.cpp index 5ce0219df7..82f79c2640 100644 --- a/platform/x11/joystick_linux.cpp +++ b/platform/x11/joystick_linux.cpp @@ -439,11 +439,9 @@ void joystick_linux::joystick_vibration_stop(int p_id, uint64_t p_timestamp) return; } - struct input_event stop; - stop.type = EV_FF; - stop.code = joy.ff_effect_id; - stop.value = 0; - write(joy.fd, (const void*)&stop, sizeof(stop)); + if (ioctl(joy.fd, EVIOCRMFF, joy.ff_effect_id) < 0) { + return; + } joy.ff_effect_id = -1; joy.ff_effect_timestamp = p_timestamp; |