From c5027b1df625b62f32d1cb4442a32f8c86ed8e18 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Tue, 22 Apr 2014 20:26:55 +0000
Subject: [PATCH] fix new bug with modifier keys being sticky in the binding
 dialogs

---
 BizHawk.Client.EmuHawk/Input/Input.cs | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/Input/Input.cs b/BizHawk.Client.EmuHawk/Input/Input.cs
index 403d78577f..a938fdaf8c 100644
--- a/BizHawk.Client.EmuHawk/Input/Input.cs
+++ b/BizHawk.Client.EmuHawk/Input/Input.cs
@@ -180,7 +180,22 @@ namespace BizHawk.Client.EmuHawk
 			if (EnableIgnoreModifiers && isModifier) return;
 			if (LastState[button] && newState) return;
 			if (!LastState[button] && !newState) return;
-			
+
+			//apply 
+			//NOTE: this is not quite right. if someone held leftshift+rightshift it would be broken. seems unlikely, though.
+			if (button == "LeftShift")
+			{
+				Console.WriteLine("Processing modifiers with " + newState);
+				_Modifiers &= ~ModifierKey.Shift;
+				if (newState)
+					_Modifiers |= ModifierKey.Shift;
+			}
+			if (button == "RightShift") { _Modifiers &= ~ModifierKey.Shift; if (newState) _Modifiers |= ModifierKey.Shift; }
+			if (button == "LeftControl") { _Modifiers &= ~ModifierKey.Control; if (newState) _Modifiers |= ModifierKey.Control; }
+			if (button == "RightControl") { _Modifiers &= ~ModifierKey.Control; if (newState) _Modifiers |= ModifierKey.Control; }
+			if (button == "LeftAlt") { _Modifiers &= ~ModifierKey.Alt; if (newState) _Modifiers |= ModifierKey.Alt; }
+			if (button == "RightAlt") { _Modifiers &= ~ModifierKey.Alt; if (newState) _Modifiers |= ModifierKey.Alt; }
+
 			if (UnpressState.ContainsKey(button))
 			{
 				if (newState) return;
@@ -190,14 +205,6 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			//apply 
-			//NOTE: this is not quite right. if someone held leftshift+rightshift it would be broken. seems unlikely, though.
-			if (button == "LeftShift") { _Modifiers &= ~ModifierKey.Shift; if (newState) _Modifiers |= ModifierKey.Shift; }
-			if (button == "RightShift") { _Modifiers &= ~ModifierKey.Shift; if (newState) _Modifiers |= ModifierKey.Shift; }
-			if (button == "LeftControl"){  _Modifiers &= ~ModifierKey.Control; if (newState) _Modifiers |= ModifierKey.Control; }
-			if (button == "RightControl"){  _Modifiers &= ~ModifierKey.Control; if (newState) _Modifiers |= ModifierKey.Control; }
-			if (button == "LeftAlt") { _Modifiers &= ~ModifierKey.Alt; if (newState) _Modifiers |= ModifierKey.Alt; }
-			if (button == "RightAlt") { _Modifiers &= ~ModifierKey.Alt; if (newState) _Modifiers |= ModifierKey.Alt; }
 
 			//dont generate events for things like Ctrl+LeftControl
 			ModifierKey mods = _Modifiers;