From dd39e95be6f76ca8fd2036fc10657049ff9639d9 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 15 Jan 2021 22:31:03 +1000 Subject: [PATCH] Fix passing the wrong string as param for Bk2LogEntryGenerator ctor fixes 0d2f01462, see #2567 not sure if the fallback in LogGeneratorInstance is a good idea but it works --- src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs | 2 +- src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs index 1cc4df9006..87231f26f1 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.InputLog.cs @@ -14,7 +14,7 @@ namespace BizHawk.Client.Common { writer.WriteLine("[Input]"); - var lg = new Bk2LogEntryGenerator(LogKey, Session.MovieController); + var lg = LogGeneratorInstance(Session.MovieController); writer.WriteLine(lg.GenerateLogKey()); foreach (var record in Log) diff --git a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs index 3760ab1bf8..3a35be6598 100644 --- a/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs +++ b/src/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs @@ -57,7 +57,7 @@ namespace BizHawk.Client.Common public ILogEntryGenerator LogGeneratorInstance(IController source) { - return new Bk2LogEntryGenerator(Emulator.SystemId, source); + return new Bk2LogEntryGenerator(Emulator?.SystemId ?? SystemID, source); } public int FrameCount => Log.Count;