diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 518358dfdf..6786d98e55 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -284,7 +284,7 @@ public bool TI83ToolTips = true; // Client Hotkey Bindings - public string HardResetBinding = "Control+R"; + public string HardResetBinding = "Ctrl+R"; public string FastForwardBinding = "J1 B6, Tab"; public string RewindBinding = "J1 B5, Shift+R"; public string EmulatorPauseBinding = "Pause"; @@ -335,8 +335,8 @@ public string HexEditor = ""; public string LuaConsole = ""; public string Cheats = ""; - public string OpenROM = "Control+O"; - public string CloseROM = "Control+W"; + public string OpenROM = "Ctrl+O"; + public string CloseROM = "Ctrl+W"; public string FrameCounterBinding = ""; public string FPSBinding = ""; public string LagCounterBinding = ""; diff --git a/BizHawk.MultiClient/Input/Input.cs b/BizHawk.MultiClient/Input/Input.cs index d57bbd770e..60f47cf7e2 100644 --- a/BizHawk.MultiClient/Input/Input.cs +++ b/BizHawk.MultiClient/Input/Input.cs @@ -44,10 +44,14 @@ namespace BizHawk.MultiClient control = control.Replace("RightControl", "LeftControl"); if (control.Contains("RightAlt")) control = control.Replace("RightAlt", "LeftAlt"); + if (control.Contains("Ctrl")) + control = control.Replace("Ctrl", "LeftControl"); if (control.Contains("Shift") && control != "LeftShift") control = control.Replace("Shift", "LeftShift"); - if (control.Contains("Control") && control != "LeftControl") + if (control.Contains("Control") && control.Trim() != "LeftControl") + control = control.Replace("Control", "LeftControl"); + if (control.Contains("Ctrl") && control.Trim() != "LeftControl") control = control.Replace("Control", "LeftControl"); if (control.Contains("Alt") && control != "LeftAlt") control = control.Replace("Alt", "LeftAlt"); diff --git a/BizHawk.MultiClient/config/InputWidget.cs b/BizHawk.MultiClient/config/InputWidget.cs index 5b05ad81f8..c2cd7033ad 100644 --- a/BizHawk.MultiClient/config/InputWidget.cs +++ b/BizHawk.MultiClient/config/InputWidget.cs @@ -167,7 +167,7 @@ namespace BizHawk.MultiClient str += key.ToString(); if (str.Length == 10 && str == "ControlKey") - str = "Control"; + str = "Ctrl"; if (str.Length == 4 && str == "Menu") str = "Alt"; if (str.Length == 8 && str == "ShiftKey") @@ -216,7 +216,7 @@ namespace BizHawk.MultiClient if ((modifiers & Keys.Shift) != 0) str = str.Insert(0, "Shift + "); if ((modifiers & Keys.Control) != 0) - str = str.Insert(0, "Control + "); + str = str.Insert(0, "Ctrl + "); if ((modifiers & Keys.Alt) != 0) str = str.Insert(0, "Alt + ");