diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs index ecf78f3592..d56e62da81 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Events.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs @@ -338,7 +338,7 @@ namespace BizHawk.Client.EmuHawk { args.OpenAdvanced = new OpenAdvanced_OpenRom(); } - else if (oac.Result == AdvancedRomLoaderType.MAMELaunchGame) + else if (oac.Result == AdvancedRomLoaderType.MameLaunchGame) { args.OpenAdvanced = new OpenAdvanced_MAME(); filter = new FilesystemFilter("MAME Arcade ROMs", new[] { "zip" }).ToString(); diff --git a/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs b/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs index 4009956e9c..49397012e3 100644 --- a/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs +++ b/BizHawk.Client.EmuHawk/OpenAdvancedChooser.cs @@ -10,6 +10,18 @@ using BizHawk.Client.Common; // these match strings from OpenAdvance. should we make them constants in there? namespace BizHawk.Client.EmuHawk { + /// + /// The Advanced ROM Loader type in MainForm/RomLoader/OpenAdvancedChooser + /// + public enum AdvancedRomLoaderType + { + None, + LibretroLaunchNoGame, + LibretroLaunchGame, + ClassicLaunchGame, + MameLaunchGame + } + public partial class OpenAdvancedChooser : Form { private readonly MainForm _mainForm; @@ -104,7 +116,7 @@ namespace BizHawk.Client.EmuHawk private void btnMAMELaunchGame_Click(object sender, EventArgs e) { - Result = AdvancedRomLoaderType.MAMELaunchGame; + Result = AdvancedRomLoaderType.MameLaunchGame; DialogResult = DialogResult.OK; Close(); } diff --git a/BizHawk.Emulation.Common/Enums.cs b/BizHawk.Emulation.Common/Enums.cs index 152e303292..fe53ceeed3 100644 --- a/BizHawk.Emulation.Common/Enums.cs +++ b/BizHawk.Emulation.Common/Enums.cs @@ -35,16 +35,4 @@ Overdump, NotInDatabase } - - /// - /// The Advanced ROM Loader type in MainForm/RomLoader/OpenAdvancedChooser - /// - public enum AdvancedRomLoaderType - { - None, - LibretroLaunchNoGame, - LibretroLaunchGame, - ClassicLaunchGame, - MAMELaunchGame - } }