zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-28 23:12:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:rheit/zdoom

Browse source
This commit is contained in:
Randy Heit 2014-12-26 15:17:20 -06:00
commit b30571b18e
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/posix/cocoa/i_joystick.cpp
View file

@ -739,6 +739,11 @@ IOKitJoystickManager* s_joystickManager;
void I_StartupJoysticks() void I_StartupJoysticks()
{ {
if (NULL != s_joystickManager)
{
return;
}
// HID Manager API is available on 10.5 (Darwin 9.x) or newer // HID Manager API is available on 10.5 (Darwin 9.x) or newer
if (darwinVersion.major >= 9) if (darwinVersion.major >= 9)
@ -750,6 +755,7 @@ void I_StartupJoysticks()
void I_ShutdownJoysticks() void I_ShutdownJoysticks()
{ {
delete s_joystickManager; delete s_joystickManager;
s_joystickManager = NULL;
} }
void I_GetJoysticks( TArray< IJoystickConfig* >& sticks ) void I_GetJoysticks( TArray< IJoystickConfig* >& sticks )