diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-01-08 21:07:15 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-01-08 21:07:15 +0000 |
| commit | 22d155c56423bc9997ae122a01f4ae1b0ef079e7 (patch) | |
| tree | 2e85bd17915662b6aa3ad0f2b37f89fbd3e30ba1 /macosx/hotkeys.m | |
| parent | 9866a42006d161b2ea42884c17102c792b4aa82d (diff) | |
| download | pcsxr-22d155c56423bc9997ae122a01f4ae1b0ef079e7.tar.gz | |
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
Diffstat (limited to 'macosx/hotkeys.m')
| -rwxr-xr-x | macosx/hotkeys.m | 5 |
1 files changed, 3 insertions, 2 deletions
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() { |