From 4afc5c4ec6b7941d13325d7473c5d1af6925afe6 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 10 Aug 2014 02:21:08 +0000 Subject: [PATCH] Fix multitrack movie recording --- BizHawk.Client.Common/movie/bk2/Bk2Movie.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs index db5a64a165..b030fc388d 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.cs @@ -89,10 +89,15 @@ namespace BizHawk.Client.Common public virtual void Truncate(int frame) { - if (frame < _log.Count) + // This is a bad way to do multitrack logic, pass the info in instead of going to the global + // and it is weird for Truncte to possibly not truncate + if (!Global.MovieSession.MultiTrack.IsActive) { - _log.RemoveRange(frame, _log.Count - frame); - Changes = true; + if (frame < _log.Count) + { + _log.RemoveRange(frame, _log.Count - frame); + Changes = true; + } } }