From 1a61d2830b76185c8190df315aa9cfc129f9896f Mon Sep 17 00:00:00 2001 From: goyuken Date: Sat, 24 Nov 2012 22:23:31 +0000 Subject: [PATCH] revert r3922 --- BizHawk.MultiClient/MainForm.cs | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 14369a7a47..2e93e95585 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -1862,24 +1862,21 @@ namespace BizHawk.MultiClient nextEmulator = c64; break; 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)) - { - 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; + if (File.Exists(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; break; } }