revert r3922

This commit is contained in:
goyuken 2012-11-24 22:23:31 +00:00
parent fec546f77a
commit 1a61d2830b
1 changed files with 13 additions and 16 deletions

View File

@ -1862,24 +1862,21 @@ namespace BizHawk.MultiClient
nextEmulator = c64; nextEmulator = c64;
break; break;
case "GBA": case "GBA":
if (INTERIM) string gbabiospath = Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGBAFirmwares, "GBA"), "gbabios.rom");
{ byte[] gbabios = null;
string gbabiospath = Path.Combine(PathManager.MakeAbsolutePath(Global.Config.PathGBAFirmwares, "GBA"), "gbabios.rom");
byte[] gbabios = null;
if (File.Exists(gbabiospath)) if (File.Exists(gbabiospath))
{ {
gbabios = File.ReadAllBytes(gbabiospath); gbabios = File.ReadAllBytes(gbabiospath);
}
else
{
MessageBox.Show(string.Format("Couldn't open GBA BIOS: {0}\nCheck your firmware config", gbabiospath));
throw new Exception();
}
GBA gba = new GBA();
gba.Load(rom.RomData, gbabios);
nextEmulator = gba;
} }
else
{
MessageBox.Show(string.Format("Couldn't open GBA BIOS: {0}\nCheck your firmware config", gbabiospath));
throw new Exception();
}
GBA gba = new GBA();
gba.Load(rom.RomData, gbabios);
nextEmulator = gba;
break; break;
} }
} }