kmx git

Commit cca094225a3e595249065c3dc21f540e616bd443

2013-10-06T20:39:23

Only allocate a joystick instance ID once we know it's a joystick. This fixes compatibility with code that assumes 0 based joystick instance IDs.

diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
index 6a75e08..55ec41e 100644
--- a/src/joystick/darwin/SDL_sysjoystick.c
+++ b/src/joystick/darwin/SDL_sysjoystick.c
@@ -589,7 +589,6 @@ HIDBuildDevice(io_object_t hidDevice)
             if (kIOReturnSuccess == result) {
                 HIDGetDeviceInfo(hidDevice, hidProperties, pDevice);    /* hidDevice used to find parents in registry tree */
                 HIDGetCollectionElements(hidProperties, pDevice);
-                pDevice->instance_id = ++s_joystick_instance_id;
             } else {
                 DisposePtr((Ptr) pDevice);
                 pDevice = NULL;
@@ -678,6 +677,9 @@ AddDeviceHelper( io_object_t ioHIDDeviceObject )
         return 0;
     }
 
+    /* Allocate an instance ID for this device */
+    device->instance_id = ++s_joystick_instance_id;
+
     /* We have to do some storage of the io_service_t for
      * SDL_HapticOpenFromJoystick */
     if (FFIsForceFeedback(ioHIDDeviceObject) == FF_OK) {

kc3-lang/SDL

Commit cca094225a3e595249065c3dc21f540e616bd443