diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2015-01-18 02:01:44 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2015-01-18 02:01:44 +0000 |
| commit | 6d22fc23d241b17c059b4582741bb49787c324a1 (patch) | |
| tree | b67df5e482d33d554db6d56fdf31c7c15035620e /macosx/Psx-Memcard/GetMetadataForFile.m | |
| parent | 686c07333da1774c7bac2d547a7728e0b0d4c29b (diff) | |
| download | pcsxr-6d22fc23d241b17c059b4582741bb49787c324a1.tar.gz | |
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
Diffstat (limited to 'macosx/Psx-Memcard/GetMetadataForFile.m')
| -rw-r--r-- | macosx/Psx-Memcard/GetMetadataForFile.m | 12 |
1 files changed, 5 insertions, 7 deletions
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]; |