diff options
| author | skidau <skidau@gmail.com> | 2015-03-06 14:05:47 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2015-03-08 20:27:13 +1100 |
| commit | 9c133c0509ff75e6e04f8d56513d6fd8196dc408 (patch) | |
| tree | ffbd5b3b95f8de3232a1fcf21c3ce2c867086983 /Source/Core/DolphinWX/Frame.cpp | |
| parent | 12ecc537e9251da148e1d6ef3f7d1759fc6b7673 (diff) | |
Readded the Key Shortcut function.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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) |