diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-05-26 20:54:20 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-05-26 20:54:20 +0000 |
| commit | d391c5951950c97d8760ef3e794a1989fc9641b8 (patch) | |
| tree | 15bed667de4515421404a3e41b06911df2a5732b /Source/Core/InputCommon/Src/ControllerInterface | |
| parent | a94c7fc534b8fcb114625f95267a01b8473ffc8d (diff) | |
Exceptions are not allowed.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5491 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm index 67498c4752..1f4b3fc499 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm +++ b/Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm @@ -96,7 +96,7 @@ int Keyboard::GetId() const Keyboard::Key::Key(IOHIDElementRef element) : m_element(element) - , m_name("RESERVED") // for some reason HID Manager gives these to us. bad_alloc! + , m_name("RESERVED") // for some reason HID Manager gives these to us. { uint32_t keycode = IOHIDElementGetUsage(m_element); for (uint32_t i = 0; i < sizeof(named_keys)/sizeof(*named_keys); i++) @@ -107,7 +107,7 @@ Keyboard::Key::Key(IOHIDElementRef element) return; } } - throw std::bad_alloc(); + NSLog(@"Got key 0x%x of type RESERVED", IOHIDElementGetUsage(m_element)); } ControlState Keyboard::Key::GetState(IOHIDDeviceRef device) |