ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)
This commit is contained in:
feos 2017-10-07 23:07:15 +03:00
parent 84412eafd9
commit 94170687a4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -514,14 +514,14 @@ namespace BizHawk.Client.Common
Log?.Dispose(); Log?.Dispose();
Log = branch.InputLog.Clone(); Log = branch.InputLog.Clone();
////_changes = true;
_lagLog.FromLagLog(branch.LagLog);
// if there are branch states, they will be loaded anyway // 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 // but if there's none, or only *after* divergent point, don't invalidate the entire movie anymore
if (divergentPoint.HasValue) if (divergentPoint.HasValue)
{ {
_stateManager.Invalidate(divergentPoint.Value); _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 else
{ {
@ -530,8 +530,7 @@ namespace BizHawk.Client.Common
_stateManager.LoadBranch(Branches.IndexOf(branch)); _stateManager.LoadBranch(Branches.IndexOf(branch));
_stateManager.SetState(branch.Frame, branch.CoreData); _stateManager.SetState(branch.Frame, branch.CoreData);
////ChangeLog = branch.ChangeLog;
if (BindMarkersToInput) // pretty critical not to erase them if (BindMarkersToInput) // pretty critical not to erase them
{ {
Markers = branch.Markers; Markers = branch.Markers;