From 5af007c07456b63eaa13d7984e79424500a9ef76 Mon Sep 17 00:00:00 2001 From: SuuperW Date: Sat, 13 Dec 2025 14:17:02 -0600 Subject: [PATCH] more sensible handling of our special hotkey default binding "conflicts" --- src/BizHawk.Client.Common/config/Binding.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Client.Common/config/Binding.cs b/src/BizHawk.Client.Common/config/Binding.cs index 5f3e1894654..7b32970a43b 100644 --- a/src/BizHawk.Client.Common/config/Binding.cs +++ b/src/BizHawk.Client.Common/config/Binding.cs @@ -208,7 +208,8 @@ void Bind(string tabGroup, string displayName, string defaultBinding = "", strin #if DEBUG var bindings = dict.Values - .Where(static info => !info.DisplayName.StartsWith("RA ") && !string.IsNullOrEmpty(info.DefaultBinding)) + // We skip TAStudio analog hotkeys because they have special handling (no other hotkey can trigger when in analog editing mode) + .Where(static info => !(info.DisplayName.StartsWith("Analog ") && info.TabGroup == "TAStudio") && !string.IsNullOrEmpty(info.DefaultBinding)) .Select(static info => info.DefaultBinding) .ToArray(); Debug.Assert(bindings.Distinct().CountIsExactly(bindings.Length), "Do not default bind multiple hotkeys to the same button combination.");