From 1162e89675ece2d4c5e14169cfedb361ae8c0762 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 19 Jul 2020 15:09:26 -0500
Subject: [PATCH] a slight hack to fix Tastudio when loading a different rom
 while it is open

---
 src/BizHawk.Client.EmuHawk/MainForm.Movie.cs | 5 ++++-
 src/BizHawk.Client.EmuHawk/MainForm.cs       | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 26a64cacaf..d6bccaffab 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -26,7 +26,10 @@ namespace BizHawk.Client.EmuHawk
 				return false;
 			}
 
-			RebootCore();
+			if (!_isLoadingRom)
+			{
+				RebootCore();
+			}
 
 			Config.RecentMovies.Add(movie.Filename);
 
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index e7c24b5a59..dec9b81e03 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3465,6 +3465,7 @@ namespace BizHawk.Client.EmuHawk
 		}
 
 		private LoadRomArgs _currentLoadRomArgs;
+		private bool _isLoadingRom;
 
 		public bool LoadRom(string path, LoadRomArgs args)
 		{
@@ -3489,6 +3490,7 @@ namespace BizHawk.Client.EmuHawk
 			if (args == null)
 				throw new ArgumentNullException(nameof(args));
 
+			_isLoadingRom = true;
 			path = EmuHawkUtil.ResolveShortcut(path);
 
 			// if this is the first call to LoadRom (they will come in recursively) then stash the args
@@ -3752,6 +3754,8 @@ namespace BizHawk.Client.EmuHawk
 				{
 					_currentLoadRomArgs = null;
 				}
+
+				_isLoadingRom = false;
 			}
 		}