diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-02-03 21:11:06 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-02-03 21:11:06 +0000 |
| commit | 435b25fa55b56e52508776672d8fee8d407f813b (patch) | |
| tree | 116645f173af12104400d926e5f847707e385fb4 /Source/Core/InputCommon | |
| parent | dfe84ce0acf288157a867f0df1678930b281fd40 (diff) | |
Fix the CMake build.
Prevent the PS3 HID crash until I can debug it.
AudioUnits are enabled by default.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7052 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm index d37e38fa72..418e4f4ef0 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm @@ -75,6 +75,8 @@ Joystick::Joystick(IOHIDDeviceRef device, std::string name, int index) ControlState Joystick::GetInputState( const ControllerInterface::Device::Input* const input) const { + if (input == NULL) // XXX + return 0; return ((Input*)input)->GetState(m_device); } |