Переглянути джерело

- fixed crash if you removed a device twice, the deviceRef is invalid if removed from the removed device callback (added in http://hg.libsdl.org/SDL/rev/d4e4d0fcda03 ).

Alfred Reynolds 11 роки тому
батько
коміт
8c2c744ad5
1 змінених файлів з 2 додано та 0 видалено
  1. 2 0
      src/joystick/darwin/SDL_sysjoystick.c

+ 2 - 0
src/joystick/darwin/SDL_sysjoystick.c

@@ -139,6 +139,7 @@ JoystickDeviceWasRemovedCallback(void *ctx, IOReturn result, void *sender)
 {
     recDevice *device = (recDevice *) ctx;
     device->removed = 1;
+    device->deviceRef = NULL; // deviceRef was invalidated due to the remove
 #if SDL_HAPTIC_IOKIT
     MacHaptic_MaybeRemoveDevice(device->ffservice);
 #endif
@@ -603,6 +604,7 @@ SDL_SYS_JoystickDetect()
 SDL_bool
 SDL_SYS_JoystickNeedsPolling()
 {
+	// BUGBUG - only works if someone else is pumping the CFRunLoop...
     return s_bDeviceAdded || s_bDeviceRemoved;
 }