mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-07 08:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'stable'

Browse source
This commit is contained in:
Jules Blok 2015-07-25 14:09:02 +02:00
commit 3801f89125
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -157,16 +157,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;