From ef337633837135e608c1e73bff4a2de7ac6b04fc Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Tue, 26 Jul 2011 01:08:38 +0000
Subject: [PATCH] TAStudio - fix rewind

---
 BizHawk.MultiClient/MainForm.cs       | 10 +++++++++-
 BizHawk.MultiClient/tools/TAStudio.cs |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 2118191bf2..5995fd74bb 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1391,7 +1391,7 @@ namespace BizHawk.MultiClient
 				runFrame = true;
 			}
 
-			if (Global.Config.RewindEnabled && Global.ClientControls["Rewind"] || PressRewind)
+			if (Global.Config.RewindEnabled && Global.ClientControls["Rewind"])// || PressRewind)
 			{
 				//* 2 to account for the fact that we need to rewind twice as fast as we play in order to rewind at the target speed
 				rewindCredits += Global.Config.SpeedPercent * 2;
@@ -1408,6 +1408,14 @@ namespace BizHawk.MultiClient
 
 				PressRewind = false;
 			}
+			else if (PressRewind) //External programs (TAStudio) can use this bool to just rewind 1 frame
+			{
+				PressRewind = false;
+				rewindCredits -= 100;
+				Rewind(1);
+				suppressCaptureRewind = true;
+				runFrame = true;
+			}
 			else rewindCredits = 0;
 
 			bool genSound = false;
diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs
index 308975b3d6..20ac070905 100644
--- a/BizHawk.MultiClient/tools/TAStudio.cs
+++ b/BizHawk.MultiClient/tools/TAStudio.cs
@@ -158,6 +158,7 @@ namespace BizHawk.MultiClient
 			TASView.Clear();
 			TASView.Update();
 			ClearPads();
+			DisplayList();
 		}
 
 		private void exitToolStripMenuItem_Click(object sender, EventArgs e)