Commit c8c818d7a4887f50382f49606fdd5a5d4f1ffa07
2020-11-23T21:14:37
Fixed bug 5360 - non-libudev joystick detection doesn't see controllers that were already connected Simon McVittie 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.
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index 9350958..e57a8ce 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -571,6 +571,10 @@ LINUX_InotifyJoystickDetect(void)
}
#endif /* HAVE_INOTIFY_H */
+/* 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)
{
@@ -615,12 +619,13 @@ LINUX_JoystickDetect(void)
}
else
#endif
- if (inotify_fd >= 0) {
#ifdef HAVE_INOTIFY_H
+ if (inotify_fd >= 0 && last_joy_detect_time != 0) {
LINUX_InotifyJoystickDetect();
-#endif
}
- else {
+ else
+#endif
+ {
LINUX_FallbackJoystickDetect();
}