From 09be2c6c7ab9d3a602fbe91d1bc3d34a79265fb2 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 31 Jul 2014 23:07:02 +0000
Subject: [PATCH] On core settings that can be gotten to without a rom loaded,
 don't do the reboot flag if nullEmulator

---
 BizHawk.Client.EmuHawk/MainForm.Events.cs | 29 +++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index cb1b284dd2..6d3f05a809 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -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
 			{