From 891d3933bdc5d2be3f0cb8876b890ac0b7181458 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 13 Nov 2014 23:49:58 +0000 Subject: [PATCH] Don't increment the Rerecord counter with loading a bk2 or tasproj movie, fixes the obvserved issue in issue 303. However, a bigger concern is why loading a movie and stopping it is causing the movie to be saved in the first place --- BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs | 2 ++ BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs index 66afb5d7b5..1739ed838d 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs @@ -105,7 +105,9 @@ namespace BizHawk.Client.Common bl.GetLump(BinaryStateLump.Input, true, delegate(TextReader tr) { var errorMessage = string.Empty; + IsCountingRerecords = false; ExtractInputLog(tr, out errorMessage); + IsCountingRerecords = true; }); if (StartsFromSavestate) diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs index 255fcfa045..a4dcc21cd8 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs @@ -144,7 +144,9 @@ namespace BizHawk.Client.Common bl.GetLump(BinaryStateLump.Input, true, delegate(TextReader tr) { var errorMessage = string.Empty; + IsCountingRerecords = false; ExtractInputLog(tr, out errorMessage); + IsCountingRerecords = true; }); if (StartsFromSavestate)