encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Sam Lantinga 2020-11-23 21:14:37 -08:00
parent 8e2746cfb6
commit c8c818d7a4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/joystick/linux/SDL_sysjoystick.c
View File

@ -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();
}