From 0e2d35d6aa4d89912eeadd226d019549b22e6583 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Thu, 26 Nov 2020 14:29:11 +1000
Subject: [PATCH] Replace ClientApi event sub with direct call in MainForm

---
 src/BizHawk.Client.EmuHawk/MainForm.cs                  | 2 ++
 src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 5b4e831690..9d55917efb 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3764,6 +3764,8 @@ namespace BizHawk.Client.EmuHawk
 						}
 					}
 
+					ExternalToolManager.BuildToolStrip();
+
 					EmuClient.OnRomLoaded(Emulator);
 					return true;
 				}
diff --git a/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
index 4c4a7fbbe7..f298f91e7e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
@@ -38,15 +38,13 @@ namespace BizHawk.Client.EmuHawk
 			DirectoryMonitor.Created += DirectoryMonitor_Created;
 			DirectoryMonitor.EnableRaisingEvents = true;
 
-			ClientApi.RomLoaded += (sender, e) => BuildToolStrip();
-
 			BuildToolStrip();
 		}
 
 		/// <summary>
 		/// Build the ToolStrip menu
 		/// </summary>
-		private static void BuildToolStrip()
+		internal static void BuildToolStrip()
 		{
 			MenuItems.Clear();
 			if (Directory.Exists(DirectoryMonitor.Path))