Debugger: Re-apply controller buttons turned on in the controller tab…

… after power cycle/reload rom First frame after reload won't see the buttons as pressed, but they'll be pressed as expected after the first frame
SourMesen · Jul 30, 2023 · f71d1e5 · f71d1e5
1 parent 00c71cc
commit f71d1e5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/UI/Debugger/ViewModels/ControllerInputViewModel.cs b/UI/Debugger/ViewModels/ControllerInputViewModel.cs
@@ -51,6 +51,11 @@ public ControllerInputViewModel(ConsoleType consoleType, int index)
 		}
 
 		private void ControllerInputViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			SetInputOverrides();
+		}
+
+		public void SetInputOverrides()
 		{
 			DebugApi.SetInputOverrides((uint)ControllerIndex - 1, new DebugControllerState() {
 				A = ButtonA,

diff --git a/UI/Debugger/ViewModels/ControllerListViewModel.cs b/UI/Debugger/ViewModels/ControllerListViewModel.cs
@@ -24,5 +24,12 @@ public ControllerListViewModel(ConsoleType consoleType)
 				Controllers.Add(new ControllerInputViewModel(consoleType, index));
 			}
 		}
+
+		public void SetInputOverrides()
+		{
+			foreach(ControllerInputViewModel controller in Controllers) {
+				controller.SetInputOverrides();
+			}
+		}
 	}
 }
diff --git a/UI/Debugger/Windows/DebuggerWindow.axaml.cs b/UI/Debugger/Windows/DebuggerWindow.axaml.cs
@@ -187,6 +187,8 @@ public void ProcessNotification(NotificationEventArgs e)
 								DataContext = _model;
 							});
 						}
+					} else {
+						_model.ControllerList.SetInputOverrides();
 					}
 
 					GameLoadedEventParams evtParams = Marshal.PtrToStructure<GameLoadedEventParams>(e.Parameter);