From a95c4f18207cd7bbb7039f03f61dd51aa9b1b689 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 15 Apr 2021 20:57:11 -0500 Subject: [PATCH] fix TAStudio auto-loading, broken by ec5e88c8 (regression introducted in 2.6) --- .../tools/TAStudio/TAStudio.ListView.cs | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 9f521e9f76..ba2f10db3d 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -479,8 +479,13 @@ namespace BizHawk.Client.EmuHawk index += ControllerType.BoolButtons.Count - 1; } - AutoPatternBool p = BoolPatterns[index]; - InputManager.AutofireStickyXorAdapter.SetSticky(button, isOn.Value, p); + // Fixes auto-loading, but why is this code like this? The code above suggests we have a BoolPattern for every bool button? But we don't + // This is a sign of a deeper problem, but this fixes some basic functionality at least + if (index < BoolPatterns.Length) + { + AutoPatternBool p = BoolPatterns[index]; + InputManager.AutofireStickyXorAdapter.SetSticky(button, isOn.Value, p); + } } else { @@ -499,8 +504,13 @@ namespace BizHawk.Client.EmuHawk value = 0; } - AutoPatternAxis p = AxisPatterns[index]; - InputManager.AutofireStickyXorAdapter.SetAxis(button, value, p); + // Fixes auto-loading, but why is this code like this? The code above suggests we have a AxisPattern for every axis button? But we don't + // This is a sign of a deeper problem, but this fixes some basic functionality at least + if (index < BoolPatterns.Length) + { + AutoPatternAxis p = AxisPatterns[index]; + InputManager.AutofireStickyXorAdapter.SetAxis(button, value, p); + } } }