From 532dc06e647ee9762ef5f3f8edeb40d54175c9b8 Mon Sep 17 00:00:00 2001 From: Morilli <35152647+Morilli@users.noreply.github.com> Date: Tue, 27 Aug 2024 23:43:55 +0200 Subject: [PATCH] tweak TasMovie.StartNewRecording slightly StartNewRecording is now always called for new tas projects in TAStudio, and the marker change code in there caused the Changes bool to get set and never cleared. --- src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 7 +++---- src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index d5e86841bc..3f5115f841 100644 --- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -75,7 +75,7 @@ namespace BizHawk.Client.Common get => base.StartsFromSavestate; set { - Markers.Add(new TasMovieMarker(0, value ? "Savestate" : "Power on"), true); + Markers.Add(new TasMovieMarker(0, value ? "Savestate" : "Power on"), skipHistory: true); base.StartsFromSavestate = value; } } @@ -123,8 +123,8 @@ namespace BizHawk.Client.Common public override void StartNewRecording() { ClearTasprojExtras(); - Markers.Add(0, StartsFromSavestate ? "Savestate" : "Power on"); - ChangeLog = new TasMovieChangeLog(this); + Markers.Add(new TasMovieMarker(0, StartsFromSavestate ? "Savestate" : "Power on"), skipHistory: true); + ClearChanges(); base.StartNewRecording(); } @@ -350,7 +350,6 @@ namespace BizHawk.Client.Common private bool IsReserved(int frame) { - // Why the frame before? // because we always navigate to the frame before and emulate 1 frame so that we ensure a proper frame buffer on the screen // users want instant navigation to markers, so to do this, we need to reserve the frame before the marker, not the marker itself diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index c05d73eb1e..977688471b 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -592,7 +592,6 @@ namespace BizHawk.Client.EmuHawk MainForm.FirmwareManager, Config.DefaultAuthor); - tasMovie.ClearChanges(); _ = StartNewMovieWrapper(tasMovie, isNew: true); // clear all selections