From 6b87e3ac91644a3a30cb411f02d21a746f86e411 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 25 Jun 2023 01:22:19 +1000
Subject: [PATCH] Fix being unable to open SubGBHawk via system menu (fixes
 #3693)

---
 src/BizHawk.Client.EmuHawk/MainForm.Events.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
index 4e96f0d515..6070173391 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1581,6 +1581,9 @@ namespace BizHawk.Client.EmuHawk
 		private DialogResult OpenSameBoySettingsDialog()
 			=> OpenGenericCoreConfigFor<Sameboy>(CoreNames.Sameboy + " Settings");
 
+		private DialogResult OpenSubGBHawkSettingsDialog()
+			=> OpenGenericCoreConfigFor<SubGBHawk>(CoreNames.SubGbHawk + " Settings");
+
 		private void GbCoreSettingsMenuItem_Click(object sender, EventArgs e)
 		{
 			_ = Emulator switch
@@ -1588,6 +1591,7 @@ namespace BizHawk.Client.EmuHawk
 				Gameboy => OpenGambatteSettingsDialog(GetSettingsAdapterForLoadedCore<Gameboy>()),
 				GBHawk => OpenGBHawkSettingsDialog(),
 				Sameboy => OpenSameBoySettingsDialog(),
+				SubGBHawk => OpenSubGBHawkSettingsDialog(),
 				_ => DialogResult.None
 			};
 		}
@@ -2941,7 +2945,7 @@ namespace BizHawk.Client.EmuHawk
 			items.Add(CreateCoreSubmenu(VSystemCategory.Consoles, CoreNames.Snes9X, CreateGenericCoreConfigItem<Snes9x>(CoreNames.Snes9X)));
 
 			// SubGBHawk
-			items.Add(CreateCoreSubmenu(VSystemCategory.Handhelds, CoreNames.SubGbHawk, CreateGenericCoreConfigItem<SubGBHawk>(CoreNames.SubGbHawk)));
+			items.Add(CreateCoreSubmenu(VSystemCategory.Handhelds, CoreNames.SubGbHawk, CreateSettingsItem("Settings...", (_, _) => OpenSubGBHawkSettingsDialog())));
 
 			// SubNESHawk
 			var subNESHawkGamepadSettingsItem = CreateSettingsItem("Controller Settings...", (_, _) => OpenNesHawkGamepadSettingsDialog(GetSettingsAdapterFor<SubNESHawk>()));