From c57cd97f565540327dc4453bc02a95766080d272 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Fri, 14 May 2021 12:16:53 +1000
Subject: [PATCH] Make MainForm.RebootCore return bool, read in
 MainForm.StartNewMovie

resolves #2147
---
 src/BizHawk.Client.Common/IMainFormForApi.cs |  2 +-
 src/BizHawk.Client.EmuHawk/MainForm.Movie.cs |  3 ++-
 src/BizHawk.Client.EmuHawk/MainForm.cs       | 11 ++++-------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/BizHawk.Client.Common/IMainFormForApi.cs b/src/BizHawk.Client.Common/IMainFormForApi.cs
index 389f54b792..bd364742d8 100644
--- a/src/BizHawk.Client.Common/IMainFormForApi.cs
+++ b/src/BizHawk.Client.Common/IMainFormForApi.cs
@@ -71,7 +71,7 @@ namespace BizHawk.Client.Common
 		void PauseEmulator();
 
 		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
-		void RebootCore();
+		bool RebootCore();
 
 		/// <remarks>only referenced from <c>EmuClientApi</c></remarks>
 		void Render();
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 12afcad72b..c9445e59e1 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -32,7 +32,8 @@ namespace BizHawk.Client.EmuHawk
 
 				if (!_isLoadingRom)
 				{
-					RebootCore();
+					var rebootSucceeded = RebootCore();
+					if (!rebootSucceeded) return false;
 				}
 
 				Config.RecentMovies.Add(movie.Filename);
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index e667176153..f46c9f0022 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -1103,20 +1103,17 @@ namespace BizHawk.Client.EmuHawk
 
 		}
 
-		public void RebootCore()
+		public bool RebootCore()
 		{
 			if (IsSlave && Master.WantsToControlReboot)
 			{
 				Master.RebootCore();
+				return true;
 			}
 			else
 			{
-				if (CurrentlyOpenRomArgs == null)
-				{
-					return;
-				}
-
-				LoadRom(CurrentlyOpenRomArgs.OpenAdvanced.SimplePath, CurrentlyOpenRomArgs);
+				if (CurrentlyOpenRomArgs == null) return true;
+				return LoadRom(CurrentlyOpenRomArgs.OpenAdvanced.SimplePath, CurrentlyOpenRomArgs);
 			}
 		}