From f6243d919b9836b4aa43921e74cd9623a93359a2 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Mon, 12 May 2014 00:37:03 +0000
Subject: [PATCH] on Mainform Text property - show filename if Game.Name is
 empty

---
 BizHawk.Client.EmuHawk/MainForm.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 4f3f4e71e8..981ff3362f 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -1377,7 +1377,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private static string DisplayNameForSystem(string system)
 		{
-			var str = String.Empty;
+			var str = string.Empty;
 			switch (system)
 			{
 				case "INTV": str = "Intellivision"; break;
@@ -2992,7 +2992,13 @@ namespace BizHawk.Client.EmuHawk
 					Global.Game.Status = nes.RomStatus;
 				}
 
-				Text = DisplayNameForSystem(loader.Game.System) + " - " + loader.Game.Name;
+				string gamename = Path.GetFileNameWithoutExtension(path);
+				if (!string.IsNullOrWhiteSpace(loader.Game.Name)) // Prefer Game db name, else use the path
+				{
+					gamename = loader.Game.Name;
+				}
+
+				Text = DisplayNameForSystem(loader.Game.System) + " - " + gamename;
 				Global.Rewinder.ResetRewindBuffer();
 
 				if (Global.Emulator.CoreComm.RomStatusDetails == null && loader.Rom != null)