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

Readded the Key Shortcut function.

This commit is contained in:
skidau 2015-03-06 14:05:47 +11:00
parent 12ecc537e9
commit 9c133c0509
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Frame.cpp
View File

@ -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)