From 6b3c631702ec15cf2fb2770dc1376bb959b954fb Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 18 Oct 2014 16:34:41 +0000 Subject: [PATCH] Tastudio - Marker list - fix rather messed up background coloring logic --- BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index 04e29de3a5..c972f8c5dd 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -54,8 +54,10 @@ namespace BizHawk.Client.EmuHawk } else if (index < Tastudio.CurrentMovie.InputLogLength) { - var record = Tastudio.CurrentMovie[index]; - if (record.HasState && record.Lagged.HasValue) + var marker = Tastudio.CurrentMovie.Markers[index]; + var record = Tastudio.CurrentMovie[marker.Frame]; + + if (record.Lagged.HasValue) { if (record.Lagged.Value) {