geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Linux build

main
Sam Lantinga 2021-11-11 12:52:31 -08:00
parent 76e3bb55bb
commit b9b0df40bf
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hidapi/SDL_hidapi.c
View File

@ -492,8 +492,8 @@ HIDAPI_ShutdownDiscovery()
#endif #endif
#if defined(SDL_USE_LIBUDEV) #if defined(SDL_USE_LIBUDEV)
if (linux_enumeration_method == ENUMERATION_LIBUDEV && if (linux_enumeration_method == ENUMERATION_LIBUDEV) {
usyms) { if (usyms) {
if (SDL_HIDAPI_discovery.m_pUdevMonitor) { if (SDL_HIDAPI_discovery.m_pUdevMonitor) {
usyms->udev_monitor_unref(SDL_HIDAPI_discovery.m_pUdevMonitor); usyms->udev_monitor_unref(SDL_HIDAPI_discovery.m_pUdevMonitor);
} }
@ -503,7 +503,17 @@ HIDAPI_ShutdownDiscovery()
SDL_UDEV_ReleaseUdevSyms(); SDL_UDEV_ReleaseUdevSyms();
usyms = NULL; usyms = NULL;
} }
}
else
#endif /* SDL_USE_LIBUDEV */
{
#if defined(HAVE_INOTIFY)
if (inotify_fd >= 0) {
close(inotify_fd);
inotify_fd = -1;
}
#endif #endif
}
SDL_HIDAPI_discovery.m_bInitialized = SDL_FALSE; SDL_HIDAPI_discovery.m_bInitialized = SDL_FALSE;
} }

7
src/joystick/hidapi/SDL_hidapijoystick.c
View File

@ -1003,13 +1003,6 @@ HIDAPI_JoystickQuit(void)
SDL_HIDAPI_QuitRumble(); SDL_HIDAPI_QuitRumble();
#if defined(HAVE_INOTIFY)
if (inotify_fd >= 0) {
close(inotify_fd);
inotify_fd = -1;
}
#endif
while (SDL_HIDAPI_devices) { while (SDL_HIDAPI_devices) {
HIDAPI_DelDevice(SDL_HIDAPI_devices); HIDAPI_DelDevice(SDL_HIDAPI_devices);
} }