tastudio:

- don't use branch laglog after loading it. it's useless because we invalidate if needed anyway
- PauseOnFrame being null started to crash seeking, fixed
- make use of movie alias in branchbox
- capture tsm state after loading the branch

todo: if we load a branch in the middle of invalid greenzone, advancing won't draw new greenzone even tho states are being created. laglog doesn't seem to allow gaps either. unsure how to resolve

BizHawk.Client.Common/movie/tasproj/TasMovie.cs

@@ -509,17 +509,13 @@ namespace BizHawk.Client.Common
 			Log?.Dispose();
 			Log = branch.InputLog.Clone();
 
-			_lagLog.FromLagLog(branch.LagLog);
-
-			// if there are branch states, they will be loaded anyway
-			// but if there's none, or only *after* divergent point, don't invalidate the entire movie anymore
 			if (divergentPoint.HasValue)
 			{
-				_stateManager.Invalidate(divergentPoint.Value);
+				InvalidateAfter(divergentPoint.Value);
 			}
 			else
 			{
-				_stateManager.Invalidate(branch.InputLog.Count);
+				InvalidateAfter(branch.InputLog.Count);
 			}
 			
 			if (BindMarkersToInput) // pretty critical not to erase them

BizHawk.Client.EmuHawk/MainForm.cs

@@ -3055,11 +3055,11 @@ namespace BizHawk.Client.EmuHawk
 				if (IsSeeking && Emulator.Frame == PauseOnFrame.Value)
 				{
 					PauseEmulator();
-					PauseOnFrame = null;
 					if (GlobalWin.Tools.IsLoaded<TAStudio>())
 					{
 						GlobalWin.Tools.TAStudio.StopSeeking();
 					}
+					PauseOnFrame = null;
 				}
 			}
 

BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs

@@ -117,7 +117,7 @@ namespace BizHawk.Client.EmuHawk
 			TasBranch branch = GetBranch(index);
 			if (branch != null)
 			{
-				var record = Tastudio.CurrentTasMovie[branch.Frame];
+				var record = Movie[branch.Frame];
 				if (index == Movie.CurrentBranch)
 				{
 					color = TAStudio.CurrentFrame_InputLog;
@@ -146,7 +146,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private TasBranch GetBranch(int index)
 		{
-			return Tastudio.CurrentTasMovie.GetBranch(index);
+			return Movie.GetBranch(index);
 		}
 
 		public void Branch()
@@ -199,13 +199,14 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			Tastudio.CurrentTasMovie.LoadBranch(branch);
+			Movie.LoadBranch(branch);
 			var stateInfo = new KeyValuePair<int, byte[]>(branch.Frame, branch.CoreData);
 			Tastudio.LoadState(stateInfo);
+			Movie.TasStateManager.Capture(true);
 			QuickBmpFile.Copy(new BitmapBufferVideoProvider(branch.OSDFrameBuffer), Tastudio.VideoProvider);
 
 			if (Tastudio.Settings.OldControlSchemeForBranches && Tastudio.TasPlaybackBox.RecordingMode)
-				Tastudio.CurrentTasMovie.Truncate(branch.Frame);
+				Movie.Truncate(branch.Frame);
 
 			GlobalWin.MainForm.PauseOnFrame = null;
 			Tastudio.RefreshDialog();
@@ -242,7 +243,7 @@ namespace BizHawk.Client.EmuHawk
 		private void AddBranchToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			Branch();
-			CallSavedCallback(Tastudio.CurrentTasMovie.BranchCount - 1);
+			CallSavedCallback(Movie.BranchCount - 1);
 			GlobalWin.OSD.AddMessage("Added branch " + Movie.CurrentBranch.ToString());
 		}
 
@@ -250,7 +251,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			Branch();
 			EditBranchTextPopUp(Movie.CurrentBranch);
-			CallSavedCallback(Tastudio.CurrentTasMovie.BranchCount - 1);
+			CallSavedCallback(Movie.BranchCount - 1);
 			GlobalWin.OSD.AddMessage("Added branch " + Movie.CurrentBranch.ToString());
 		}
 
@@ -366,13 +367,13 @@ namespace BizHawk.Client.EmuHawk
 			if (_branchUndo == BranchUndo.Load)
 			{
 				LoadBranch(_backupBranch);
-				CallLoadedCallback(Tastudio.CurrentTasMovie.Branches.IndexOf(_backupBranch));
+				CallLoadedCallback(Movie.Branches.IndexOf(_backupBranch));
 				GlobalWin.OSD.AddMessage("Branch Load canceled");
 			}
 			else if (_branchUndo == BranchUndo.Update)
 			{
 				Movie.UpdateBranch(Movie.GetBranch(_backupBranch.UniqueIdentifier), _backupBranch);
-				CallSavedCallback(Tastudio.CurrentTasMovie.Branches.IndexOf(_backupBranch));
+				CallSavedCallback(Movie.Branches.IndexOf(_backupBranch));
 				GlobalWin.OSD.AddMessage("Branch Update canceled");
 			}
 			else if (_branchUndo == BranchUndo.Text)
@@ -384,7 +385,7 @@ namespace BizHawk.Client.EmuHawk
 			{
 				Movie.AddBranch(_backupBranch);
 				BranchView.RowCount = Movie.BranchCount;
-				CallSavedCallback(Tastudio.CurrentTasMovie.Branches.IndexOf(_backupBranch));
+				CallSavedCallback(Movie.Branches.IndexOf(_backupBranch));
 				GlobalWin.OSD.AddMessage("Branch Removal canceled");
 			}
 

BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs

@@ -191,7 +191,7 @@ namespace BizHawk.Client.EmuHawk
 				this.Invoke(() => SavingProgressBar.Visible = true);
 				for (;;)
 				{
-					if (_seekBackgroundWorker.CancellationPending || !this.IsHandleCreated)
+					if (_seekBackgroundWorker.CancellationPending || !IsHandleCreated || !Mainform.PauseOnFrame.HasValue)
 					{
 						e.Cancel = true;
 						break;