From 911385aff671d0e4360e6bc1dce7425a54182e05 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 6 Aug 2013 01:32:00 +0000
Subject: [PATCH] Hotkeys - if a hotkey isn't found, return an empty object
 rather than null, so that at least it doesn't call exceptions in menu items
 that reference them for shortcut key strings

---
 BizHawk.MultiClient/Config.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs
index 9f4d94b6c9..25fee0866a 100644
--- a/BizHawk.MultiClient/Config.cs
+++ b/BizHawk.MultiClient/Config.cs
@@ -867,7 +867,7 @@ namespace BizHawk.MultiClient
 		{
 			get
 			{
-				return Bindings.FirstOrDefault(x => x.DisplayName == index) ?? null;
+				return Bindings.FirstOrDefault(x => x.DisplayName == index) ?? new Binding();
 			}
 		}
 	}