From f59cfb1710c51bff9566762f0a8506cb6e75d648 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Wed, 17 Jul 2024 22:33:52 +0200
Subject: [PATCH] set current branch properly in TAStudio movie load

apparently, GoToFrame might frameadvance, which in turn calls UpdateAfter(), which in turns updates the current selected branch in the TasSession with the value of the current movie.
So, we need to set the current movie's current branch from the session's value before it gets deleted.

- closes #3968
---
 src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs | 1 +
 src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
index 83a4fb5687..816f5fec14 100644
--- a/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
+++ b/src/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs
@@ -134,6 +134,7 @@ namespace BizHawk.Client.Common
 				try
 				{
 					TasSession = JsonConvert.DeserializeObject<TasSession>(json);
+					Branches.Current = TasSession.CurrentBranch;
 				}
 				catch
 				{
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 69e31a5dde..b2963242dd 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -558,7 +558,6 @@ namespace BizHawk.Client.EmuHawk
 			SetUpToolStripColumns();
 
 			CurrentTasMovie.PropertyChanged += TasMovie_OnPropertyChanged;
-			CurrentTasMovie.Branches.Current = CurrentTasMovie.TasSession.CurrentBranch;
 			BookMarkControl.UpdateTextColumnWidth();
 			MarkerControl.UpdateTextColumnWidth();
 			// clear all selections