diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2012-08-05 17:28:57 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2012-08-05 17:28:57 +0200 |
| commit | fe1501db9aedaf0563ed2ede5aee930b4d37506d (patch) | |
| tree | d738e96e0ad31ace16ac8e53a9ecb86ddc75cc33 /Source/Core | |
| parent | b3c9f437db116eae1d6df1068029c8b1eab60357 (diff) | |
Check if WX recognized a key before testing if it's a hotkey
Fixes issue 5537.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index dd31b1f157..3efc26610b 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -797,8 +797,9 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) bool IsHotkey(wxKeyEvent &event, int Id) { - return (event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] && - event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]); + return (event.GetKeyCode() && + event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[Id] && + event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[Id]); } int GetCmdForHotkey(unsigned int key) |