From 93b71373eba302ad2a6af6c8823a3a75471fd3b9 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 2 Aug 2014 02:41:12 +0000
Subject: [PATCH] Rom Loader - Catch CGBNotSupportedException and output a
 message to the screen, then automatically reload the rom in regular mode

---
 BizHawk.Client.Common/RomLoader.cs | 21 +++++++++++++++++++--
 BizHawk.Client.EmuHawk/MainForm.cs |  3 ++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index 6870f7ebfc..994f7e1922 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -61,6 +61,17 @@ namespace BizHawk.Client.Common
 
 		}
 
+		// For not throwing errors but simply outputing information to the screen
+		public Action<string> MessageCallback { get; set; }
+
+		private void DoMessageCallback(string message)
+		{
+			if (MessageCallback != null)
+			{
+				MessageCallback(message);
+			}
+		}
+
 		// TODO: reconsider the need for exposing these;
 		public IEmulator LoadedEmulator { get; private set; }
 		public GameInfo Game { get; private set; }
@@ -388,8 +399,8 @@ namespace BizHawk.Client.Common
 									}
 									catch
 									{
-										// failed to load SGB bios.  to avoid catch-22, disable SGB mode
-										DoLoadErrorCallback("Failed to load a GB rom in SGB mode.  Disabling SGB Mode.", game.System);
+										// failed to load SGB bios or game does not support SGB mode. 
+										// To avoid catch-22, disable SGB mode
 										Global.Config.GB_AsSGB = false;
 										throw;
 									}
@@ -456,6 +467,12 @@ namespace BizHawk.Client.Common
 					{
 						DoLoadErrorCallback(ex.Message, system, LoadErrorType.MissingFirmware);
 					}
+					else if (ex is CGBNotSupportedException)
+					{
+						// Note: GB as SGB was set to false by this point, otherwise we would want to do it here
+						DoMessageCallback("Failed to load a GB rom in SGB mode.  Disabling SGB Mode.");
+						return LoadRom(path, nextComm);
+					}
 					else
 					{
 						DoLoadErrorCallback("A core accepted the rom, but threw an exception while loading it:\n\n" + ex, system);
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index bae37eba55..6d437aec94 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3089,7 +3089,8 @@ namespace BizHawk.Client.EmuHawk
 				{
 					ChooseArchive = LoadArhiveChooser,
 					ChoosePlatform = ChoosePlatformForRom,
-					Deterministic = deterministic
+					Deterministic = deterministic,
+					MessageCallback = GlobalWin.OSD.AddMessage
 				};
 
 			loader.OnLoadError += ShowLoadError;