From 75e6216ca23b469cfd56d12a2b766845f917d8ce Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sat, 17 Oct 2015 19:11:04 -0400
Subject: [PATCH] Rom Loader - don't call message boxes, use the error callback

---
 BizHawk.Client.Common/BizHawk.Client.Common.csproj |  1 -
 BizHawk.Client.Common/RomLoader.cs                 | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 118a38e7b3..e32d67cbb3 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -243,7 +243,6 @@
     <Compile Include="tools\RamSearchEngine.cs" />
     <Compile Include="tools\Watch.cs" />
     <Compile Include="tools\WatchList.cs" />
-    <Compile Include="UIHelper.cs" />
     <Compile Include="XmlGame.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index 9827265f2d..dfe9b9aa62 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -31,7 +31,7 @@ namespace BizHawk.Client.Common
 {
 	public class RomLoader
 	{
-		public enum LoadErrorType { Unknown, MissingFirmware, XML }
+		public enum LoadErrorType { Unknown, MissingFirmware, XML, DiscError }
 
 		// helper methods for the settings events
 		private object GetCoreSettings<T>()
@@ -265,7 +265,7 @@ namespace BizHawk.Client.Common
 
 							if (discMountJob.OUT_SlowLoadAborted)
 							{
-								System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk");
+								DoLoadErrorCallback("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk", "", LoadErrorType.DiscError);
 								return false;
 							}
 
@@ -324,7 +324,7 @@ namespace BizHawk.Client.Common
 
 						if (discMountJob.OUT_SlowLoadAborted)
 						{
-							System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk");
+							DoLoadErrorCallback("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk", "", LoadErrorType.DiscError);
 							return false;
 						}
 
@@ -460,7 +460,7 @@ namespace BizHawk.Client.Common
 
 										if (discMountJob.OUT_SlowLoadAborted)
 										{
-											System.Windows.Forms.MessageBox.Show("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk");
+											DoLoadErrorCallback("This disc would take too long to load. Run it through discohawk first, or find a new rip because this one is probably junk", "PSX", LoadErrorType.DiscError);
 											return false;
 										}
 
@@ -515,7 +515,7 @@ namespace BizHawk.Client.Common
 							{
 								// need to get rid of this hack at some point
 								rom = new RomGame(file);
-								((CoreFileProvider)nextComm.CoreFileProvider).SubfileDirectory = Path.GetDirectoryName(path.Replace("|", String.Empty)); // Dirty hack to get around archive filenames (since we are just getting the directory path, it is safe to mangle the filename
+								((CoreFileProvider)nextComm.CoreFileProvider).SubfileDirectory = Path.GetDirectoryName(path.Replace("|", string.Empty)); // Dirty hack to get around archive filenames (since we are just getting the directory path, it is safe to mangle the filename
 								byte[] romData = null;
 								byte[] xmlData = rom.FileData;