From 435b25fa55b56e52508776672d8fee8d407f813b Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Thu, 3 Feb 2011 21:11:06 +0000 Subject: 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 --- Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/Core/InputCommon') 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); } -- cgit v1.2.3