From 94170687a4f636d2711d3cf04fbcd37acd325637 Mon Sep 17 00:00:00 2001 From: feos Date: Sat, 7 Oct 2017 23:07:15 +0300 Subject: [PATCH] tastudio: always assign branch's laglog when it's loaded fixes failure to color greenzone if a branch without input diff was loaded (and some other weird conditions were met) --- BizHawk.Client.Common/movie/tasproj/TasMovie.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index ed41d86b61..4b5c27aa04 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -514,14 +514,14 @@ namespace BizHawk.Client.Common Log?.Dispose(); Log = branch.InputLog.Clone(); - ////_changes = true; + + _lagLog.FromLagLog(branch.LagLog); // if there are branch states, they will be loaded anyway // but if there's none, or only *after* divergent point, don't invalidate the entire movie anymore if (divergentPoint.HasValue) { _stateManager.Invalidate(divergentPoint.Value); - _lagLog.FromLagLog(branch.LagLog); // don't truncate LagLog if the branch's one is shorter, but input is the same } else { @@ -530,8 +530,7 @@ namespace BizHawk.Client.Common _stateManager.LoadBranch(Branches.IndexOf(branch)); _stateManager.SetState(branch.Frame, branch.CoreData); - - ////ChangeLog = branch.ChangeLog; + if (BindMarkersToInput) // pretty critical not to erase them { Markers = branch.Markers;