From 9c133c0509ff75e6e04f8d56513d6fd8196dc408 Mon Sep 17 00:00:00 2001 From: skidau Date: Fri, 6 Mar 2015 14:05:47 +1100 Subject: [PATCH] Readded the Key Shortcut function. --- Source/Core/DolphinWX/Frame.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 84272227f7..5c536229d4 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -948,7 +948,9 @@ static bool IsHotkey(wxKeyEvent &event, int id, bool held = false) return HotkeyManagerEmu::IsPressed(id, held); } - return false; + return (event.GetKeyCode() != WXK_NONE && + event.GetKeyCode() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkey[id] && + event.GetModifiers() == SConfig::GetInstance().m_LocalCoreStartupParameter.iHotkeyModifier[id]); } int GetCmdForHotkey(unsigned int key)