|
@@ -142,13 +142,15 @@ IsJoystick(int fd, char *namebuf, const size_t namebuflen, SDL_JoystickGUID *gui
|
|
|
#if SDL_USE_LIBUDEV
|
|
|
void joystick_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath)
|
|
|
{
|
|
|
- if (devpath == NULL || !(udev_class & SDL_UDEV_DEVICE_JOYSTICK)) {
|
|
|
+ if (devpath == NULL) {
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
- switch( udev_type )
|
|
|
- {
|
|
|
+
|
|
|
+ switch (udev_type) {
|
|
|
case SDL_UDEV_DEVICEADDED:
|
|
|
+ if (!(udev_class & SDL_UDEV_DEVICE_JOYSTICK)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
MaybeAddDevice(devpath);
|
|
|
break;
|
|
|
|
|
@@ -335,13 +337,12 @@ JoystickInitWithoutUdev(void)
|
|
|
static int
|
|
|
JoystickInitWithUdev(void)
|
|
|
{
|
|
|
-
|
|
|
if (SDL_UDEV_Init() < 0) {
|
|
|
return SDL_SetError("Could not initialize UDEV");
|
|
|
}
|
|
|
|
|
|
/* Set up the udev callback */
|
|
|
- if ( SDL_UDEV_AddCallback(joystick_udev_callback) < 0) {
|
|
|
+ if (SDL_UDEV_AddCallback(joystick_udev_callback) < 0) {
|
|
|
SDL_UDEV_Quit();
|
|
|
return SDL_SetError("Could not set up joystick <-> udev callback");
|
|
|
}
|