From 22d155c56423bc9997ae122a01f4ae1b0ef079e7 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Tue, 8 Jan 2013 21:07:15 +0000
Subject: Build the Recent Menu source file. Check to see if we have a binding
 to get info from before using it.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82119 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/Pcsxr.xcodeproj/project.pbxproj | 2 ++
 macosx/hotkeys.m                       | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index 0218a19a..cf72aa49 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -30,6 +30,7 @@
 		2BB3D6C405427FE200831ACB /* PcsxrPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BA44361052DB2EA00E21DDD /* PcsxrPlugin.m */; };
 		2BB3D6C605427FE200831ACB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BC4786204C7FD3600CAB520 /* Cocoa.framework */; };
 		2BB3D6C805427FE200831ACB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6E8AB404C8327C0017A3B1 /* IOKit.framework */; };
+		5529EA11169CBE3400BAA2A5 /* RecentItemsMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 5550D2721683C923006C56B5 /* RecentItemsMenu.m */; };
 		5586CD9714AFADD9008EF4EE /* PeopsSpuSDL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DD110C356FD00365243 /* PeopsSpuSDL.psxplugin */; };
 		5586CD9814AFADD9008EF4EE /* PeopsSpuAL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 28B467F11463D0020083F129 /* PeopsSpuAL.psxplugin */; };
 		559366CA12B694DF004ACC1E /* iR3000A-64.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C112B694DF004ACC1E /* iR3000A-64.c */; };
@@ -846,6 +847,7 @@
 				55BBA69C1495839A003B2CEC /* PcsxrFreezeStateHandler.m in Sources */,
 				0280B7AD16764CC5007B8001 /* HotkeyController.m in Sources */,
 				02717968167884C9004AED62 /* hotkeys.m in Sources */,
+				5529EA11169CBE3400BAA2A5 /* RecentItemsMenu.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/macosx/hotkeys.m b/macosx/hotkeys.m
index 1c917439..96c1d4b9 100755
--- a/macosx/hotkeys.m
+++ b/macosx/hotkeys.m
@@ -18,7 +18,7 @@
 static id monitor;
 static id gpuMonitor;
 static int currentState = 0;
-static NSMutableDictionary *hotkeys;
+static NSMutableDictionary *hotkeys = nil;
 enum {
     HK_FAST_FORWARD,
     HK_SAVE_STATE,
@@ -86,7 +86,8 @@ bool handleHotkey(NSString* keyCode) {
 }
 
 void setupHotkey(int hk, NSString *label, NSDictionary *binding) {
-    [hotkeys setObject:[NSNumber numberWithInt:hk] forKey:[binding objectForKey:@"keyCode"]];
+	if(binding != nil)
+		[hotkeys setObject:[NSNumber numberWithInt:hk] forKey:[binding objectForKey:@"keyCode"]];
 }
 
 void setupHotkeys() {
-- 
cgit v1.2.3