From 25a4ce52cff1841a526d901b63f03bc9e3d378df Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 27 Aug 2013 00:47:18 +0000
Subject: [PATCH] show N64 menu in null emulator mode (no rom loaded), single
 instance mode - message box alerting the user that a reboot is required

---
 BizHawk.MultiClient/MainForm.MenuItems.cs | 2 ++
 BizHawk.MultiClient/MainForm.cs           | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index f7dbceb34a..52a434054d 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -1184,6 +1184,8 @@ namespace BizHawk.MultiClient
 		private void singleInstanceModeToolStripMenuItem_Click(object sender, EventArgs e)
 		{
 			Global.Config.SingleInstanceMode ^= true;
+
+			MessageBox.Show("BizHawk must be restarted for this setting to take effect.", "Reboot Required", MessageBoxButtons.OK, MessageBoxIcon.Information);
 		}
 
 		private void MainForm_Deactivate(object sender, EventArgs e)
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index e84de329c4..7c71b2e68b 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -815,6 +815,10 @@ namespace BizHawk.MultiClient
 
 			switch (system)
 			{
+				default:
+				case "NULL":
+					n64ToolStripMenuItem.Visible = true;
+					break;
 				case "TI83":
 					tI83ToolStripMenuItem.Visible = true;
 					break;