ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Exceptions are not allowed. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5491 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-05-26 20:54:20 +00:00
parent a94c7fc534
commit d391c59519
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXKeyboard.mm
View File

@ -96,7 +96,7 @@ int Keyboard::GetId() const
Keyboard::Key::Key(IOHIDElementRef element) Keyboard::Key::Key(IOHIDElementRef element)
: m_element(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); uint32_t keycode = IOHIDElementGetUsage(m_element);
for (uint32_t i = 0; i < sizeof(named_keys)/sizeof(*named_keys); i++) for (uint32_t i = 0; i < sizeof(named_keys)/sizeof(*named_keys); i++)
@ -107,7 +107,7 @@ Keyboard::Key::Key(IOHIDElementRef element)
return; return;
} }
} }
throw std::bad_alloc(); NSLog(@"Got key 0x%x of type RESERVED", IOHIDElementGetUsage(m_element));
} }
ControlState Keyboard::Key::GetState(IOHIDDeviceRef device) ControlState Keyboard::Key::GetState(IOHIDDeviceRef device)