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(); } /// /// Build the ToolStrip menu /// - private static void BuildToolStrip() + internal static void BuildToolStrip() { MenuItems.Clear(); if (Directory.Exists(DirectoryMonitor.Path))