Merge pull request dolphin-emu#2777 from Armada651/hotkey-down

HotkeyManager: Activate hotkey when key is pressed.
Ben754 · Jul 25, 2015 · 4d5f693 · 4d5f693
2 parents 75fc213 + 3814b5b
commit 4d5f693
Showing 1 changed file with 2 additions and 4 deletions.
diff --git 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;