From ebc0134db075d4a4c9afb887e6c35365c49c8cef Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Sun, 13 Mar 2011 00:44:45 +0000
Subject: [PATCH] moar fix bettar

---
 BizHawk.MultiClient/MainForm.MenuItems.cs |  3 ++-
 BizHawk.MultiClient/MainForm.cs           | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index 7425e114a3..a759065364 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -250,11 +250,12 @@ namespace BizHawk.MultiClient
 		{
 			CloseGame();
 			Global.Emulator = new NullEmulator();
+			Global.Game = null;
             RamSearch1.Restart();
             HexEditor1.Restart();
             NESPPU1.Restart();
 			Text = "BizHawk";
-            HandlePlatformMenus("");
+            HandlePlatformMenus();
 		}
 
 		private void saveStateToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 48590eee2f..843c99b2aa 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -381,8 +381,11 @@ namespace BizHawk.MultiClient
 			return "";
 		}
 
-        private void HandlePlatformMenus(string system)
+        private void HandlePlatformMenus()
         {
+			string system = "";
+			if (Global.Game != null)
+				system = Global.Game.System;
             switch (system)
             {
                 case "NES":
@@ -516,7 +519,7 @@ namespace BizHawk.MultiClient
 				HexEditor1.Restart();
                 NESPPU1.Restart();
 				CurrentlyOpenRom = path;
-                HandlePlatformMenus(Global.Game.System);
+                HandlePlatformMenus();
 				return true;
 			}
 		}
@@ -1102,7 +1105,7 @@ namespace BizHawk.MultiClient
 
 		private void menuStrip1_MenuActivate(object sender, EventArgs e)
 		{
-            HandlePlatformMenus(Global.Game.System);
+            HandlePlatformMenus();
             if (Global.Config.PauseWhenMenuActivated)
 			{
 				if (EmulatorPaused)
@@ -1218,10 +1221,7 @@ namespace BizHawk.MultiClient
 
         private void MainForm_Shown(object sender, EventArgs e)
         {
-			if(Global.Game == null)
-				HandlePlatformMenus("");
-			else
-				HandlePlatformMenus(Global.Game.System);
+			HandlePlatformMenus();
         }
 	}
 }
\ No newline at end of file