From f94460dc46e614a4110df3500225e64f2e449d85 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Tue, 21 Apr 2015 23:50:15 +0000
Subject: [PATCH] fix bsnes xml loading

---
 BizHawk.Client.Common/CoreFileProvider.cs |  6 +++++-
 BizHawk.Client.Common/RomGame.cs          |  1 +
 BizHawk.Client.Common/RomLoader.cs        | 21 +++++++++++++++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Client.Common/CoreFileProvider.cs b/BizHawk.Client.Common/CoreFileProvider.cs
index 5c96ec540f..5a3c23f987 100644
--- a/BizHawk.Client.Common/CoreFileProvider.cs
+++ b/BizHawk.Client.Common/CoreFileProvider.cs
@@ -19,7 +19,7 @@ namespace BizHawk.Client.Common
 
 		public string PathSubfile(string fname)
 		{
-			return Path.Combine(Path.GetDirectoryName(SubfileDirectory) ?? String.Empty, fname);
+			return Path.Combine(SubfileDirectory ?? String.Empty, fname);
 		}
 
 		public string DllPath()
@@ -110,7 +110,11 @@ namespace BizHawk.Client.Common
 		// this should go away now
 		public static void SyncCoreCommInputSignals(CoreComm target)
 		{
+			string superhack = null;
+			if (target.CoreFileProvider != null && target.CoreFileProvider is CoreFileProvider)
+				superhack = ((CoreFileProvider)target.CoreFileProvider ).SubfileDirectory;
 			var cfp = new CoreFileProvider(target.ShowMessage);
+			cfp.SubfileDirectory = superhack;
 			target.CoreFileProvider = cfp;
 			cfp.FirmwareManager = Global.FirmwareManager;
 		}
diff --git a/BizHawk.Client.Common/RomGame.cs b/BizHawk.Client.Common/RomGame.cs
index 8e4cbdcc1f..165caf8f9e 100644
--- a/BizHawk.Client.Common/RomGame.cs
+++ b/BizHawk.Client.Common/RomGame.cs
@@ -51,6 +51,7 @@ namespace BizHawk.Client.Common
 
 			// read the entire file into FileData.
 			FileData = new byte[fileLength];
+			stream.Position = 0;
 			stream.Read(FileData, 0, fileLength);
 
 			// if there was no header offset, RomData is equivalent to FileData 
diff --git a/BizHawk.Client.Common/RomLoader.cs b/BizHawk.Client.Common/RomLoader.cs
index abe5ae19a9..d6afe9aa0d 100644
--- a/BizHawk.Client.Common/RomLoader.cs
+++ b/BizHawk.Client.Common/RomLoader.cs
@@ -353,8 +353,25 @@ namespace BizHawk.Client.Common
 						}
 						catch (Exception ex)
 						{
-							DoLoadErrorCallback(ex.ToString(), "DGB", LoadErrorType.XML);
-							return false;
+							try
+							{
+								// 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
+								byte[] romData = null;
+								byte[] xmlData = rom.FileData;
+
+								game = rom.GameInfo;
+								game.System = "SNES";
+								
+								var snes = new LibsnesCore(game, romData, Deterministic, xmlData, nextComm, GetCoreSettings<LibsnesCore>(), GetCoreSyncSettings<LibsnesCore>());
+								nextEmulator = snes;
+							}
+							catch 
+							{
+								DoLoadErrorCallback(ex.ToString(), "DGB", LoadErrorType.XML);
+								return false;
+							}
 						}
 					}
 					else // most extensions