diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-06 20:09:08 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-06 20:09:08 +0000 |
| commit | e58027046dd248ad572903d8453668a990ae5c9d (patch) | |
| tree | 17437802c04eb0d157d12bf0fdc2593e799051b4 /macosx/ConfigurationController.m | |
| parent | 175bee7ad34b2350f642d3d084dd9c2a27be5804 (diff) | |
| download | pcsxr-e58027046dd248ad572903d8453668a990ae5c9d.tar.gz | |
Get multi-block save copying working correctly on OS X.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85876 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/ConfigurationController.m')
| -rwxr-xr-x | macosx/ConfigurationController.m | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m index 633be834..794b310f 100755 --- a/macosx/ConfigurationController.m +++ b/macosx/ConfigurationController.m @@ -58,16 +58,6 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; } } -- (IBAction)mcdChangeClicked:(id)sender -{ - [ConfigurationController mcdChangeClicked:sender]; -} - -- (IBAction)mcdNewClicked:(id)sender -{ - [ConfigurationController mcdNewClicked:sender]; -} - + (void)mcdChangeClicked:(id)sender { NSInteger tag = [sender tag]; @@ -91,8 +81,7 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; [openDlg setNameFieldStringValue:[path lastPathComponent]]; if ([openDlg runModal] == NSFileHandlingPanelOKButton) { - NSArray* urls = [openDlg URLs]; - NSURL *mcdURL = [urls objectAtIndex:0]; + NSURL *mcdURL = [[openDlg URLs] objectAtIndex:0]; [ConfigurationController setMemoryCard:tag toURL:mcdURL]; } @@ -123,7 +112,6 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; //Workaround/kludge to make sure we create a memory card before posting a notification strlcpy(mcd, [[mcdURL path] fileSystemRepresentation], MAXPATHLEN); - CreateMcd(mcd); [ConfigurationController setMemoryCard:tag toURL:mcdURL]; @@ -160,8 +148,6 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; [[self window] center]; - - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(memoryCardDidChangeNotification:) name:memChangeNotifier object:nil]; // setup checkboxes checkBoxDefaults = [[NSMutableDictionary alloc] init]; @@ -200,7 +186,7 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; } #ifdef __i386__ - //i386 on OS X doesn't like the dynarec core + //OS X on i386 doesn't like the dynarec core [usesDynarecCell setState:NSOffState]; [usesDynarecCell setEnabled:NO]; #endif @@ -256,7 +242,6 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; return nil; } - - (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem { NSWindow *window = [self window]; |
