Commit 9f50d63dd5cf8dc348b6a61839ae6cbd0e994013
2015-06-24T17:54:39
Fixed an issue with mouse/keyboard removal Sometimes, on removal SDL_EVDEV_udev_callback() gets called with zero udev_class. This in turn seems to be caused the SDL_udev.c:guess_device_class() failing to find the attributes of the parent device. Apparently this is normal, attributes are not guaranteed to be in place during removal, depending on timing. This lack of attributes causes guess_device_class() to return zero. This fix mimics the code in linux/SDL_sysjoystick.c:joystick_udev_callback() which effectively has the same fix already in place.
diff --git a/src/core/linux/SDL_evdev.c b/src/core/linux/SDL_evdev.c
index ff93d6e..8b1c41c 100644
--- a/src/core/linux/SDL_evdev.c
+++ b/src/core/linux/SDL_evdev.c
@@ -547,12 +547,11 @@ void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class, con
return;
}
- if (!(udev_class & (SDL_UDEV_DEVICE_MOUSE|SDL_UDEV_DEVICE_KEYBOARD))) {
- return;
- }
-
- switch( udev_type ) {
+ switch(udev_type) {
case SDL_UDEV_DEVICEADDED:
+ if (!(udev_class & (SDL_UDEV_DEVICE_MOUSE|SDL_UDEV_DEVICE_KEYBOARD))) {
+ return;
+ }
SDL_EVDEV_device_added(devpath);
break;