From bc4330a9d1df1ed8cf84fa1ce4b5bbe1a86b1e44 Mon Sep 17 00:00:00 2001
From: upthorn <upthorn@gmail.com>
Date: Thu, 3 Jan 2019 05:53:26 -0800
Subject: [PATCH] External tools no longer crash on loading new ROM

---
 BizHawk.Client.EmuHawk/Api/ApiManager.cs      | 52 +++++++++++++++++++
 .../BizHawk.Client.EmuHawk.csproj             |  2 +-
 BizHawk.Client.EmuHawk/MainForm.cs            |  2 +-
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 BizHawk.Client.EmuHawk/Api/ApiManager.cs

diff --git a/BizHawk.Client.EmuHawk/Api/ApiManager.cs b/BizHawk.Client.EmuHawk/Api/ApiManager.cs
new file mode 100644
index 0000000000..9dd5b71087
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/Api/ApiManager.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+using BizHawk.Common.ReflectionExtensions;
+using BizHawk.Emulation.Common;
+using BizHawk.Client.ApiHawk;
+
+namespace BizHawk.Client.EmuHawk
+
+{
+	public static class ApiManager
+	{
+		private static ApiContainer container;
+		private static void Register(IEmulatorServiceProvider serviceProvider)
+		{
+			// Register external apis
+			var apis = Assembly
+				.Load("BizHawk.Client.ApiHawk")
+				.GetTypes()
+				.Where(t => typeof(IExternalApi).IsAssignableFrom(t))
+				.Where(t => t.IsSealed)
+				.Where(t => ServiceInjector.IsAvailable(serviceProvider, t))
+				.ToList();
+
+			apis.AddRange(
+				Assembly
+				.GetAssembly(typeof(ApiContainer))
+				.GetTypes()
+				.Where(t => typeof(IExternalApi).IsAssignableFrom(t))
+				.Where(t => t.IsSealed)
+				.Where(t => ServiceInjector.IsAvailable(serviceProvider, t)));
+
+			foreach (var api in apis)
+			{
+				var instance = (IExternalApi)Activator.CreateInstance(api);
+				ServiceInjector.UpdateServices(serviceProvider, instance);
+				Libraries.Add(api, instance);
+			}
+			container = new ApiContainer(Libraries);
+			GlobalWin.ApiProvider = new BasicApiProvider(container);
+		}
+		private static readonly Dictionary<Type, IExternalApi> Libraries = new Dictionary<Type, IExternalApi>();
+		public static void Restart(IEmulatorServiceProvider newServiceProvider)
+		{
+			Libraries.Clear();
+			Register(newServiceProvider);
+		}
+	}
+}
diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index efbb0d391d..e149f0bf88 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -664,7 +664,7 @@
     <Compile Include="Api\Libraries\GuiApi.cs" />
     <Compile Include="Api\Libraries\InputApi.cs" />
     <Compile Include="Api\Libraries\SaveStateAPI.cs" />
-    <Compile Include="Api\Libraries\PluginLibrary.cs" />
+    <Compile Include="Api\ApiManager.cs" />
     <Compile Include="Api\Libraries\CommApi.cs" />
     <!--<Compile Include="Input\GamePad.cs" Condition=" '$(OS)' == 'Windows_NT' " />-->
     <Compile Include="Input\GamePad.cs" />
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 626e98fe2b..5ac22ab9f3 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3793,8 +3793,8 @@ namespace BizHawk.Client.EmuHawk
 						}
 					}
 
-					GlobalWin.Tools.Restart();
 					ApiManager.Restart(Emulator.ServiceProvider);
+					GlobalWin.Tools.Restart();
 
 					if (Global.Config.LoadCheatFileByGame)
 					{