diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-07-25 14:08:03 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-07-25 14:08:03 +0200 |
| commit | 4d5f693d88e9be2e16fa37a55041b50068397d9a (patch) | |
| tree | d748424718f0883604bf5f9eacdc762a944a75ae /Source/Core | |
| parent | 75fc2133592018ceb6b6a3e3bccbd66087492703 (diff) | |
| parent | 3814b5b7024e03fbb2a9be2784842b586d96d17a (diff) | |
Merge pull request #2777 from Armada651/hotkey-down
HotkeyManager: Activate hotkey when key is pressed.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HotkeyManager.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index 64ffb097f7..2e53ad1ac0 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -159,16 +159,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; |