|
@@ -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) {
|