diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index dfdb4c3466..3023b8191c 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -699,7 +699,7 @@ namespace BizHawk.Client.EmuHawk SetTasMovieCallbacks(tasMovie); tasMovie.ClearChanges(); // Don't ask to save changes here. - if (HandleMovieLoadStuff(tasMovie)) + if (HandleMovieLoadStuff(tasMovie, false)) { CurrentTasMovie.TasStateManager.Capture(); // Capture frame 0 always. } @@ -717,14 +717,23 @@ namespace BizHawk.Client.EmuHawk TasView.Refresh(); } - private bool HandleMovieLoadStuff(ITasMovie movie) + private bool HandleMovieLoadStuff(ITasMovie movie, bool loadMovie = true) { WantsToControlStopMovie = false; - var result = StartNewMovieWrapper(movie); - if (!result) + if (loadMovie) { - return false; + var result = StartNewMovieWrapper(movie); + + if (!result) + { + return false; + } + } + else + { + MovieSession.QueueNewMovie(movie, true, Emulator.SystemId); + MovieSession.RunQueuedMovie(true, Emulator); } WantsToControlStopMovie = true;