From 58ff3fa60d1acab96e6ac97e5a041695538bb6df Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 1 Feb 2020 16:21:38 -0600 Subject: [PATCH] Tastudio - remember the "Bind Markers to input" settings as a tastudio setting --- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs | 2 +- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index ef00859d77..8df29f70ad 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -1017,7 +1017,7 @@ namespace BizHawk.Client.EmuHawk private void BindMarkersToInputMenuItem_Click(object sender, EventArgs e) { - CurrentTasMovie.BindMarkersToInput = BindMarkersToInputMenuItem.Checked; + Settings.BindMarkersToInput = CurrentTasMovie.BindMarkersToInput = BindMarkersToInputMenuItem.Checked; } private void EmptyNewMarkerNotesMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 4361a727ee..90b7cc5220 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -105,6 +105,7 @@ namespace BizHawk.Client.EmuHawk public bool DenoteMarkersWithBGColor { get; set; } public int MainVerticalSplitDistance { get; set; } public int BranchMarkerSplitDistance { get; set; } + public bool BindMarkersToInput { get; set; } } #region Initializing @@ -311,6 +312,7 @@ namespace BizHawk.Client.EmuHawk } TasView.Font = TasViewFont; + CurrentTasMovie.BindMarkersToInput = Settings.BindMarkersToInput; RefreshDialog(); _initialized = true; } @@ -561,6 +563,7 @@ namespace BizHawk.Client.EmuHawk TasMovie newMovie = new TasMovie(startsFromSavestate: startsFromSavestate); newMovie.TasStateManager.InvalidateCallback = GreenzoneInvalidated; newMovie.Filename = file.FullName; + newMovie.BindMarkersToInput = Settings.BindMarkersToInput; BookMarkControl.LoadedCallback = BranchLoaded; BookMarkControl.SavedCallback = BranchSaved; @@ -613,8 +616,9 @@ namespace BizHawk.Client.EmuHawk if (AskSaveChanges()) { Global.MovieSession.Movie = new TasMovie(); + CurrentTasMovie.BindMarkersToInput = Settings.BindMarkersToInput; + var stateManager = ((TasMovie)Global.MovieSession.Movie).TasStateManager; - stateManager.InvalidateCallback = GreenzoneInvalidated; BookMarkControl.LoadedCallback = BranchLoaded;