From c3334038954affcccce413377574632a19a9f69e Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 28 Feb 2016 12:15:23 -0500
Subject: [PATCH] Prevent Advanced loader from pooping all over every other
 tool, this needs to be refactored

---
 BizHawk.Client.EmuHawk/MainForm.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 30911a02bd..1fa92909dc 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -858,7 +858,7 @@ namespace BizHawk.Client.EmuHawk
 
 		public void RebootCore()
 		{
-			var ioa = OpenAdvancedSerializer.ParseWithLegacy(CurrentlyOpenRom);
+			var ioa = OpenAdvancedSerializer.ParseWithLegacy(CurrentlyOpenRomPoopForAdvancedLoaderPleaseRefactorME);
 			if (ioa is OpenAdvanced_LibretroNoGame)
 				LoadRom("", CurrentlyOpenRomArgs);
 			else
@@ -3460,7 +3460,8 @@ namespace BizHawk.Client.EmuHawk
 					}
 
 					SetWindowText();
-					CurrentlyOpenRom = loaderName;
+					CurrentlyOpenRomPoopForAdvancedLoaderPleaseRefactorME = loaderName;
+					CurrentlyOpenRom = loaderName.Replace("*OpenRom*", ""); // POOP
 					HandlePlatformMenus();
 					_stateSlots.Clear();
 					UpdateCoreStatusBarButton();
@@ -3521,6 +3522,8 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private string CurrentlyOpenRomPoopForAdvancedLoaderPleaseRefactorME = "";
+
 		private static void CommitCoreSettingsToConfig()
 		{
 			// save settings object