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

Merge pull request #2777 from Armada651/hotkey-down 

HotkeyManager: Activate hotkey when key is pressed.
This commit is contained in:
Jules Blok 2015-07-25 14:08:03 +02:00
parent 75fc213359 3814b5b702
commit 4d5f693d88
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HotkeyManager.cpp
View File

@ -159,16 +159,14 @@ bool IsPressed(int Id, bool held)
unsigned int setKey = Id % 32; unsigned int setKey = Id % 32;
if (s_hotkey.button[set] & (1 << setKey)) if (s_hotkey.button[set] & (1 << setKey))
{ {
bool pressed = !!(s_hotkeyDown[set] & (1 << setKey));
s_hotkeyDown[set] |= (1 << setKey); s_hotkeyDown[set] |= (1 << setKey);
if (held) if (!pressed || held)
return true; return true;
} }
else else
{ {
bool pressed = !!(s_hotkeyDown[set] & (1 << setKey));
s_hotkeyDown[set] &= ~(1 << setKey); s_hotkeyDown[set] &= ~(1 << setKey);
if (pressed)
return true;
} }
return false; return false;