Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-22 16:55:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Date: Mon, 29 Jul 2002 15:07:22 +1000

Browse Source 
From: screwtape@froup.com

The attached patch lets SDL_Init(SDL_INIT_JOYSTICK) succeed on Mac OS
X when there are no joysticks attached, in line with SDL's behaviour
on Linux.
This commit is contained in:
Sam Lantinga
2002-07-29 22:26:43 +00:00
parent 5dc7b830e6
commit 0f17f6d59e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/joystick/darwin/SDL_sysjoystick.c
View File

@@ -609,11 +609,17 @@ int SDL_SYS_JoystickInit(void)
/*/ Now search I/O Registry for matching devices. */
result = IOServiceGetMatchingServices (masterPort, hidMatchDictionary, &hidObjectIterator);
/* Check for errors */
if ((kIOReturnSuccess != result) || (NULL == hidObjectIterator))
if (kIOReturnSuccess != result)
{
SDL_SetError("Joystick: Couldn't create a HID object iterator.");
return -1;
}
if (NULL == hidObjectIterator) /* there are no joysticks */
{
gpDeviceList = NULL;
SDL_numjoysticks = 0;
return 0;
}
/* IOServiceGetMatchingServices consumes a reference to the dictionary, so we don't need to release the dictionary ref. */
/* build flat linked list of devices from device iterator */