From d94ce80eaa3690b1b42b10685c10593b4cd2361a Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 19 Jul 2020 16:47:54 -0500
Subject: [PATCH] Tastudio - gracefully fallback to a new tasproj when
 attempting to load a .tasproj from another core

---
 .../tools/TAStudio/TAStudio.MenuItems.cs           |  2 +-
 .../tools/TAStudio/TAStudio.cs                     | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index f242cd98b5..63e25afeb7 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -112,7 +112,7 @@ namespace BizHawk.Client.EmuHawk
 				{
 					if (ofd.FileName.EndsWith(MovieService.TasMovieExtension))
 					{
-						LoadFile(new FileInfo(ofd.FileName));
+						LoadFileWithFallback(ofd.FileName);
 					}
 					else if (ofd.FileName.EndsWith(MovieService.StandardMovieExtension))
 					{
diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 77ef6d2872..b3ff06f130 100644
--- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -682,7 +682,19 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (AskSaveChanges())
 			{
-				LoadFile(new FileInfo(path));
+				LoadFileWithFallback(path);
+			}
+		}
+
+		private void LoadFileWithFallback(string path)
+		{
+			var result = LoadFile(new FileInfo(path));
+			if (!result)
+			{
+				TasView.AllColumns.Clear();
+				WantsToControlReboot = false;
+				StartNewTasMovie();
+				_engaged = true;
 			}
 		}