From 59440c1d4df54a41442ec098f67280cafdb94f4e Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Fri, 23 May 2014 15:10:14 +0000
Subject: [PATCH] NES stuff

---
 BizHawk.Client.EmuHawk/MainForm.cs                   | 2 +-
 BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 4c5d979bfb..b1d35941b7 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3004,7 +3004,7 @@ namespace BizHawk.Client.EmuHawk
 				if (loader.LoadedEmulator is NES)
 				{
 					var nes = loader.LoadedEmulator as NES;
-					if (nes.GameName != null)
+					if (!string.IsNullOrWhiteSpace(nes.GameName))
 					{
 						Global.Game.Name = nes.GameName;
 					}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
index 0e62f26f59..68a333bdad 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
@@ -661,6 +661,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
 				}
 			}
 
+			game_name = choice.name;
 
 			//find a INESBoard to handle this
 			if (choice != null)