From 16afcffe819ef4568558473cf6af07def788cc20 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Thu, 9 Mar 2023 23:26:21 +1000
Subject: [PATCH] Clean up how SGB/SNES menus for BSNES are handled

makes Satellaview a 0 LOC change, and deleting old BSNES will be easier too
---
 src/BizHawk.Client.EmuHawk/MainForm.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 35c05c78a6..215c6984d6 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2045,7 +2045,8 @@ namespace BizHawk.Client.EmuHawk
 			zXSpectrumToolStripMenuItem.Visible = false;
 			amstradCPCToolStripMenuItem.Visible = false;
 
-			switch (Emulator.SystemId)
+			var sysID = Emulator.SystemId;
+			switch (sysID)
 			{
 				case VSystemID.Raw.NULL:
 					break;
@@ -2095,13 +2096,12 @@ namespace BizHawk.Client.EmuHawk
 					GBSubMenu.Visible = true;
 					SameBoyColorChooserMenuItem.Visible = Emulator is Sameboy { IsCGBMode: false }; // palette config only works in DMG mode
 					break;
-				case VSystemID.Raw.SGB when Emulator is BsnesCore or SubBsnesCore:
-				case VSystemID.Raw.SNES when Emulator is LibsnesCore { IsSGB: true }: // doesn't use "SGB" sysID
-					SNESSubMenu.Text = "&SGB";
+				case VSystemID.Raw.SNES when Emulator is LibsnesCore oldBSNES: // doesn't use "SGB" sysID, always "SNES"
+					SNESSubMenu.Text = oldBSNES.IsSGB ? "&SGB" : "&SNES";
 					SNESSubMenu.Visible = true;
 					break;
-				case VSystemID.Raw.SNES when Emulator is LibsnesCore or BsnesCore or SubBsnesCore:
-					SNESSubMenu.Text = "&SNES";
+				case var _ when Emulator is BsnesCore or SubBsnesCore:
+					SNESSubMenu.Text = $"&{sysID}";
 					SNESSubMenu.Visible = true;
 					break;
 				default: