From 13044547e4ad042afac9729a5d7525c1c60ddf85 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@expion.com>
Date: Sun, 28 Jun 2015 10:43:45 -0400
Subject: [PATCH] Tastudio - fix issue #446 - don't greenzone between the mouse
 down and mouse up events when editing input

---
 .../movie/tasproj/TasMovie.Editing.cs               |  5 ++++-
 BizHawk.Client.Common/movie/tasproj/TasMovie.cs     | 13 +++++++++----
 .../tools/TAStudio/TAStudio.ListView.cs             |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
index 769c01bd95..9f7737ff50 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
@@ -23,7 +23,10 @@ namespace BizHawk.Client.Common
 			LagLog.RemoveFrom(frame);
 			LagLog[frame] = Global.Emulator.AsInputPollable().IsLagFrame;
 
-			StateManager.Capture();
+			if (!SupressGreenzonging)
+			{
+				StateManager.Capture();
+			}
 
 			if (frame != 0)
 				ChangeLog.SetGeneralRedo();
diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
index 49aef33274..b3e7e71d93 100644
--- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
+++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
@@ -239,13 +239,18 @@ namespace BizHawk.Client.Common
 			return base.GetInputState(frame);
 		}
 
+		public bool SupressGreenzonging { get; set; }
+
 		public void GreenzoneCurrentFrame()
 		{
-			LagLog[Global.Emulator.Frame] = Global.Emulator.AsInputPollable().IsLagFrame;
-
-			if (!StateManager.HasState(Global.Emulator.Frame))
+			if (!SupressGreenzonging)
 			{
-				StateManager.Capture();
+				LagLog[Global.Emulator.Frame] = Global.Emulator.AsInputPollable().IsLagFrame;
+
+				if (!StateManager.HasState(Global.Emulator.Frame))
+				{
+					StateManager.Capture();
+				}
 			}
 		}
 
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index ee43e58546..fdcccb9f10 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -285,6 +285,7 @@ namespace BizHawk.Client.EmuHawk
 
 			if (e.Button == MouseButtons.Left)
 			{
+				CurrentTasMovie.SupressGreenzonging = true; // This is necessary because we will invalidate, but we won't navigate until mouse up, during that time the user may have emulated frames and we don't want to caputre states for those
 				_leftButtonHeld = true;
 				// SuuperW: Exit float editing mode, or re-enter mouse editing
 				if (_floatEditRow != -1)
@@ -422,6 +423,7 @@ namespace BizHawk.Client.EmuHawk
 			}
 			else if (e.Button == MouseButtons.Left)
 			{
+				CurrentTasMovie.SupressGreenzonging = false;
 				_startMarkerDrag = false;
 				_startFrameDrag = false;
 				_startBoolDrawColumn = string.Empty;