From 87dd32eeaccca680b2349311b7eda702d8a5a487 Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Mon, 5 Oct 2015 00:24:41 +0300
Subject: [PATCH] tastudio: found another bomb set by picking branch states by
index. two actually.
---
BizHawk.Client.Common/movie/tasproj/TasStateManager.cs | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
index 9811f9d2e4..8b13eb284a 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasStateManager.cs
@@ -289,7 +289,7 @@ namespace BizHawk.Client.Common
return _movie.Markers.IsMarker(States[frame].Frame + 1);
else
{
- if (_movie.GetBranch(branch).Markers == null)
+ if (_movie.GetBranch(_movie.BranchIndexByHash(branch)).Markers == null)
return _movie.Markers.IsMarker(States[frame].Frame + 1);
else
return _movie.GetBranch(branch).Markers.Any(m => m.Frame + 1 == frame);
@@ -727,7 +727,10 @@ namespace BizHawk.Client.Common
if (!States.ContainsValue(s))
{
if (BranchStates.ContainsKey(s.Frame))
- ret.Y = BranchStates[s.Frame].Values.IndexOf(s);
+ {
+ int index = BranchStates[s.Frame].Values.IndexOf(s);
+ ret.Y = BranchStates[s.Frame].Keys.ElementAt(index);
+ }
if (ret.Y == -1)
return new Point(-1, -2);
}