diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs index d201b3c6ca..f6a9a6de7f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs @@ -210,7 +210,7 @@ namespace BizHawk.Client.EmuHawk SelectedZone.Start = Emulator.Frame; } - SelectedZone.PlaceZone(CurrentMovie); + SelectedZone.PlaceZone(CurrentMovie, Config); } private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs index a7fe60e9ce..41ab69c613 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Macros/MovieZone.cs @@ -124,7 +124,7 @@ namespace BizHawk.Client.EmuHawk _controller = newController; } - public void PlaceZone(IMovie movie) + public void PlaceZone(IMovie movie, Config config) { if (movie is ITasMovie tasMovie) { @@ -192,7 +192,7 @@ namespace BizHawk.Client.EmuHawk if (movie.InputLogLength >= _emulator.Frame) { movie.SwitchToPlay(); - GlobalWin.Config.Movies.MovieEndAction = MovieEndAction.Record; + config.Movies.MovieEndAction = MovieEndAction.Record; // TODO: this is a bad place to do this, and introduces a config dependency } } diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index a9af559fb1..3ab829d5d3 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -254,7 +254,7 @@ namespace BizHawk.Client.EmuHawk if (macro != null) { macro.Start = TasView.FirstSelectedIndex ?? 0; - macro.PlaceZone(CurrentTasMovie); + macro.PlaceZone(CurrentTasMovie, Config); } } diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 0b20544d90..38a1e64056 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -713,7 +713,7 @@ namespace BizHawk.Client.EmuHawk { Start = TasView.FirstSelectedIndex ?? 0 }; - loadZone.PlaceZone(CurrentTasMovie); + loadZone.PlaceZone(CurrentTasMovie, Config); } private void TastudioPlayMode()