From 74dcd81b85e454d617e81ad76283b5d4ad82e879 Mon Sep 17 00:00:00 2001 From: Morilli <35152647+Morilli@users.noreply.github.com> Date: Wed, 28 Aug 2024 00:52:07 +0200 Subject: [PATCH] don't control stop movie in TAStudio movie load was removed in b6a0688be0aedf3e5588cefda2fe8ec7d6b2a226, and while not strictly required this will leak TasMovies otherwise. --- .../tools/TAStudio/TAStudio.IControlMainForm.cs | 4 +--- src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs index f9d1accbb1..c3fabeb55f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs @@ -63,7 +63,7 @@ { Activate(); _suppressAskSave = suppressSave; - NewTasMenuItem_Click(null, null); + StartNewTasMovie(); _suppressAskSave = false; } } @@ -106,9 +106,7 @@ public bool RestartMovie() { if (!AskSaveChanges()) return false; - WantsToControlStopMovie = false; var success = StartNewMovieWrapper(CurrentTasMovie, isNew: false); - WantsToControlStopMovie = true; RefreshDialog(); return success; } diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 977688471b..e9773faee5 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -610,7 +610,9 @@ namespace BizHawk.Client.EmuHawk SetTasMovieCallbacks(movie); SuspendLayout(); + WantsToControlStopMovie = false; bool result = MainForm.StartNewMovie(movie, isNew); + WantsToControlStopMovie = true; ResumeLayout(); if (result) {