On core settings that can be gotten to without a rom loaded, don't do the reboot flag if nullEmulator

This commit is contained in:
adelikat 2014-07-31 23:07:02 +00:00
parent 45b8854295
commit 09be2c6c7a
1 changed files with 24 additions and 5 deletions
BizHawk.Client.EmuHawk

View File

@ -1031,19 +1031,31 @@ namespace BizHawk.Client.EmuHawk
private void GBInSGBMenuItem_Click(object sender, EventArgs e)
{
Global.Config.GB_AsSGB ^= true;
FlagNeedsReboot();
if (!(Global.Emulator is NullEmulator))
{
FlagNeedsReboot();
}
}
private void NesInQuickNESMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NES_InQuickNES ^= true;
FlagNeedsReboot();
if (!(Global.Emulator is NullEmulator))
{
FlagNeedsReboot();
}
}
private void SnesWithSnes9xMenuItem_Click(object sender, EventArgs e)
{
Global.Config.SNES_InSnes9x ^= true;
FlagNeedsReboot();
if (!(Global.Emulator is NullEmulator))
{
FlagNeedsReboot();
}
}
private void N64VideoPluginSettingsMenuItem_Click(object sender, EventArgs e)
@ -1778,8 +1790,15 @@ namespace BizHawk.Client.EmuHawk
{
if (new N64VideoPluginconfig().ShowDialog() == DialogResult.OK)
{
GlobalWin.MainForm.FlagNeedsReboot();
GlobalWin.OSD.AddMessage("Plugin settings saved but a core reboot is required");
if (Global.Emulator is NullEmulator)
{
GlobalWin.OSD.AddMessage("Plugin settings saved");
}
else
{
GlobalWin.MainForm.FlagNeedsReboot();
GlobalWin.OSD.AddMessage("Plugin settings saved but a core reboot is required");
}
}
else
{