From fe1501db9aedaf0563ed2ede5aee930b4d37506d Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 5 Aug 2012 17:28:57 +0200 Subject: [PATCH] Check if WX recognized a key before testing if it's a hotkey Fixes issue 5537. --- Source/Core/DolphinWX/Src/Frame.cpp | 5 +++-- 1 file 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)