From b2c3530164a798d22c5b797dce73ae33a9e6f3c0 Mon Sep 17 00:00:00 2001
From: kylelyk <kylelyk@gmail.com>
Date: Fri, 22 Aug 2014 14:42:31 +0000
Subject: [PATCH] AutoRestoreLastPosition now works.

---
 BizHawk.Client.EmuHawk/CustomControls/TasListView.cs | 12 ++++++------
 .../tools/TAStudio/TAStudio.ListView.cs              |  8 +++++++-
 BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs    |  3 ---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs b/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
index b0100d6d88..6a67e9605e 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
@@ -51,11 +51,11 @@ namespace BizHawk.Client.EmuHawk
 		public bool InputPaintingMode { get; set; }
 		public bool IsPaintDown { get; private set; }
 
-        /// <summary>
-        /// Calculates the column name and row number that the point (x, y) lies in.
-        /// </summary>
-        /// <param name="x">X coordinate</param>
-        /// <param name="y">Y coordinate</param>
+		/// <summary>
+		/// Calculates the column name and row number that the point (x, y) lies in.
+		/// </summary>
+		/// <param name="x">X coordinate</param>
+		/// <param name="y">Y coordinate</param>
 		private void CalculatePointedCell(int x, int y)
 		{
 			int? newRow;
@@ -74,7 +74,7 @@ namespace BizHawk.Client.EmuHawk
 				break;
 			}
 
-            var rowHeight = this.LineHeight;// 5 (in VirtualListView) and 6 work here for me, but are they always dependable, how can I get the padding?
+			var rowHeight = this.LineHeight;// 5 (in VirtualListView) and 6 work here for me, but are they always dependable, how can I get the padding?
 			var headerHeight = rowHeight + 6;
 
 			newRow = ((y - headerHeight) / rowHeight) + this.VScrollPos;
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 049c9e41f3..61917658ac 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -201,7 +201,7 @@ namespace BizHawk.Client.EmuHawk
 					{
 						_startFrameDrag = true;
 					}
-					else
+					else//User changed input
 					{
 						var frame = TasView.PointedCell.Row.Value;
 						var buttonName = TasView.PointedCell.Column;
@@ -212,6 +212,12 @@ namespace BizHawk.Client.EmuHawk
 							GoToLastEmulatedFrameIfNecessary(TasView.PointedCell.Row.Value);
 							TasView.Refresh();
 
+							if (Global.Config.TAStudioAutoRestoreLastPosition)
+							{
+								GlobalWin.MainForm.UnpauseEmulator();
+								GlobalWin.MainForm.PauseOnFrame = Global.Emulator.Frame;
+							}
+
 							_startBoolDrawColumn = TasView.PointedCell.Column;
 							_boolPaintState = _currentTasMovie.BoolIsPressed(frame, buttonName);
 						}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 3cdf33ecc1..3ee0f9a7a2 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -276,7 +276,6 @@ namespace BizHawk.Client.EmuHawk
 
 						GlobalWin.DisplayManager.NeedsToPaint = true;
 						TasView.ensureVisible(frame);
-						RefreshDialog();
 					}
 					else
 					{
@@ -401,8 +400,6 @@ namespace BizHawk.Client.EmuHawk
 				_currentTasMovie.Markers.Add(markerFrame, i.PromptText);
 				MarkerControl.Refresh();
 			}
-
-			MarkerControl.Refresh();
 		}
 
 		private void UpdateChangesIndicator()