diff options
| author | m6c7l <m6c7l@web.de> | 2020-03-23 22:11:58 +0100 |
|---|---|---|
| committer | m6c7l <m6c7l@web.de> | 2020-03-24 08:42:21 +0100 |
| commit | 36293f4256931d4693befb033880823eb4c0426e (patch) | |
| tree | 608c22b668330b3f8969f154d57d8c98e93bf480 /platform/x11 | |
| parent | 20edf69f96160fcf7c0ea2449f4daf50f572ce99 (diff) | |
issue-37239 add relaxation to conditions in the joystick check routine for being identified as joystick
Diffstat (limited to 'platform/x11')
| -rw-r--r-- | platform/x11/joypad_linux.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/platform/x11/joypad_linux.cpp b/platform/x11/joypad_linux.cpp index a9fe7275c2..1aacc6a250 100644 --- a/platform/x11/joypad_linux.cpp +++ b/platform/x11/joypad_linux.cpp @@ -340,7 +340,10 @@ void JoypadLinux::open_joypad(const char *p_path) { (test_bit(ABS_X, absbit) || test_bit(ABS_Y, absbit) || test_bit(ABS_HAT0X, absbit) || test_bit(ABS_GAS, absbit) || test_bit(ABS_RUDDER, absbit)) && (test_bit(BTN_A, keybit) || test_bit(BTN_THUMBL, keybit) || - test_bit(BTN_TRIGGER, keybit) || test_bit(BTN_1, keybit)))) { + test_bit(BTN_TRIGGER, keybit) || test_bit(BTN_1, keybit))) && + !(test_bit(EV_ABS, evbit) && + test_bit(ABS_X, absbit) && test_bit(ABS_Y, absbit) && + test_bit(ABS_RX, absbit) && test_bit(ABS_RY, absbit))) { close(fd); return; } |