Skip to content

Commit 0520345

Browse files
authored
more sensible handling of our special hotkey default binding "conflicts" (#4584)
1 parent 0bf162a commit 0520345

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

src/BizHawk.Client.Common/config/Binding.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ void Bind(string tabGroup, string displayName, string defaultBinding = "", strin
208208

209209
#if DEBUG
210210
var bindings = dict.Values
211-
.Where(static info => !info.DisplayName.StartsWith("RA ") && !string.IsNullOrEmpty(info.DefaultBinding))
211+
// We skip TAStudio analog hotkeys because they have special handling (no other hotkey can trigger when in analog editing mode)
212+
.Where(static info => !(info.DisplayName.StartsWith("Analog ") && info.TabGroup == "TAStudio") && !string.IsNullOrEmpty(info.DefaultBinding))
212213
.Select(static info => info.DefaultBinding)
213214
.ToArray();
214215
Debug.Assert(bindings.Distinct().CountIsExactly(bindings.Length), "Do not default bind multiple hotkeys to the same button combination.");

0 commit comments

Comments
 (0)