From 6d22fc23d241b17c059b4582741bb49787c324a1 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Sun, 18 Jan 2015 02:01:44 +0000 Subject: OS X: Fix pressing "i" making the emulator speeding up. This was caused by gpuKeypress in HandleKey to interpret the I key as GPU_FRAME_LIMIT. Having the block check for the NSControlKeyMask fixes this. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92900 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/Psx-Memcard/GetMetadataForFile.m | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'macosx/Psx-Memcard/GetMetadataForFile.m') diff --git a/macosx/Psx-Memcard/GetMetadataForFile.m b/macosx/Psx-Memcard/GetMetadataForFile.m index ac0722a7..41e0e224 100644 --- a/macosx/Psx-Memcard/GetMetadataForFile.m +++ b/macosx/Psx-Memcard/GetMetadataForFile.m @@ -12,11 +12,11 @@ #include "sio.h" #define MAX_MEMCARD_BLOCKS 15 -#define kPCSXRSaveNames @"com_codeplex_pcsxr_memcard_savenames" -#define kPCSXRMemCount @"com_codeplex_pcsxr_memcard_memcount" -#define kPCSXRFreeBlocks @"com_codeplex_pcsxr_memcard_freeblocks" -#define kPCSXRMemNames @"com_codeplex_pcsxr_memcard_memnames" -#define kPCSXRMemIDs @"com_codeplex_pcsxr_memcard_memids" +#define kPCSXRSaveNames @"com_codeplex_pcsxr_memcard_savenames" +#define kPCSXRMemCount @"com_codeplex_pcsxr_memcard_memcount" +#define kPCSXRFreeBlocks @"com_codeplex_pcsxr_memcard_freeblocks" +#define kPCSXRMemNames @"com_codeplex_pcsxr_memcard_memnames" +#define kPCSXRMemIDs @"com_codeplex_pcsxr_memcard_memids" //============================================================================== // @@ -191,13 +191,11 @@ Boolean GetMetadataForFile(void *thisInterface, CFMutableDictionaryRef attribute } memCount++; freeBlocks -= x; - //enName = [@(memBlock.Title) stringByTrimmingCharactersInSet:theCharSet]; jpName = [[NSString alloc] initWithCString:memBlock.sTitle encoding:NSShiftJISStringEncoding]; jpName = [jpName stringByTrimmingCharactersInSet:theCharSet]; memName = @(memBlock.Name); memID = @(memBlock.ID); - //[enNames addObject:enName]; [jpNames addObject:jpName]; [memNames addObject:memName]; [memIDs addObject:memID]; -- cgit v1.2.3