diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-12 20:12:54 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-12 20:12:54 +0000 |
| commit | 578f268a3e5f74e2f09e074cfba2271f790f3faa (patch) | |
| tree | 4c4a53d030283e5e60a51a89e02f9c8ebb77a0e5 | |
| parent | 6420584693290cc119768491087a7fdf7ee487e4 (diff) | |
| download | pcsxr-578f268a3e5f74e2f09e074cfba2271f790f3faa.tar.gz | |
Fixing bug 10934.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86055 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rwxr-xr-x | macosx/hotkeys.m | 2 | ||||
| -rwxr-xr-x | macosx/plugins/DFInput/macsrc/PadView.m | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/macosx/hotkeys.m b/macosx/hotkeys.m index a3fcbfa7..9ae83047 100755 --- a/macosx/hotkeys.m +++ b/macosx/hotkeys.m @@ -76,7 +76,7 @@ BOOL handleHotkey(NSString* keyCode) { GPU_displayText((char*)[[NSString stringWithFormat:@"State Slot: %d", currentState] UTF8String]); break; default: - NSLog(@"Invalid hotkey identifier %li.", [ident integerValue]); + NSLog(@"Invalid hotkey identifier %i.", [ident intValue]); } return YES; diff --git a/macosx/plugins/DFInput/macsrc/PadView.m b/macosx/plugins/DFInput/macsrc/PadView.m index 8d1be4af..8694316c 100755 --- a/macosx/plugins/DFInput/macsrc/PadView.m +++ b/macosx/plugins/DFInput/macsrc/PadView.m @@ -69,7 +69,8 @@ [deviceMenu addItemWithTitle:@"(Keyboard only)"]; for (i = 0; i < SDL_NumJoysticks(); i++) { - [deviceMenu addItemWithTitle:@(SDL_JoystickName(i))]; + NSMenuItem * joystickItem = [[NSMenuItem alloc] initWithTitle:@(SDL_JoystickName(i)) action:NULL keyEquivalent:@""]; + [[deviceMenu menu] addItem:joystickItem]; } if (g.cfg.PadDef[which].DevNum >= SDL_NumJoysticks()) { |