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

Merge branch 'stable'

This commit is contained in:
Jules Blok 2015-07-25 14:09:02 +02:00
parent dfe5ed54a4 4d5f693d88
commit 3801f89125
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

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