We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] joystick: Fix initial detection when not using udev

0001-joystick-Fix-initial-detection-when-not-using-udev-b.patch (text/plain), 1.39 KB, created by Simon McVittie on 2020-11-19 17:29:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2020-11-19 17:29:44 UTC

Size: 1.39 KB

patch

obsolete

>From f0d2aae635fd526cd09b26b4f879892fc0828f0c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Thu, 19 Nov 2020 17:13:13 +0000
>Subject: [PATCH] joystick: Fix initial detection when not using udev (bug
> 5360)
>
>When watching for hotplug events we can poll the inotify fd, but we
>still need to scan /dev/input once per process, otherwise we'll fail
>to detect devices that were already connected.
>
>Resolves: https://bugzilla.libsdl.org/show_bug.cgi?id=5360
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> src/joystick/linux/SDL_sysjoystick.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
>index b7e1b984b..892b28f3f 100644
>--- a/src/joystick/linux/SDL_sysjoystick.c
>+++ b/src/joystick/linux/SDL_sysjoystick.c
>@@ -547,6 +547,10 @@ LINUX_InotifyJoystickDetect(void)
>     }
> }
> 
>+/* Detect devices by reading /dev/input. In the inotify code path we
>+ * have to do this the first time, to detect devices that already existed
>+ * before we started; in the non-inotify code path we do this repeatedly
>+ * (polling). */
> static void
> LINUX_FallbackJoystickDetect(void)
> {
>@@ -591,7 +595,7 @@ LINUX_JoystickDetect(void)
>     }
>     else
> #endif
>-    if (inotify_fd >= 0) {
>+    if (inotify_fd >= 0 && last_joy_detect_time != 0) {
>         LINUX_InotifyJoystickDetect();
>     }
>     else {
>-- 
>2.29.2
>

Actions: View | Diff

Attachments on bug 5360: 4529

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.