diff options
| -rwxr-xr-x | macosx/ConfigurationController.m | 1 | ||||
| -rwxr-xr-x | macosx/PcsxrMemCardHandler.m | 6 | ||||
| -rwxr-xr-x | macosx/PcsxrPluginHandler.m | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m index 270abc97..8f6a296d 100755 --- a/macosx/ConfigurationController.m +++ b/macosx/ConfigurationController.m @@ -127,7 +127,6 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey"; RELEASEOBJ(openDlg); } - - (IBAction)setVideoType:(id)sender { int tag = [[sender selectedItem] tag]; diff --git a/macosx/PcsxrMemCardHandler.m b/macosx/PcsxrMemCardHandler.m index 21a96869..32f6b0dd 100755 --- a/macosx/PcsxrMemCardHandler.m +++ b/macosx/PcsxrMemCardHandler.m @@ -8,6 +8,7 @@ #import "PcsxrMemCardHandler.h" #import "ConfigurationController.h" +#import "EmuThread.h" #import "ARCBridge.h" @implementation PcsxrMemCardHandler @@ -54,10 +55,13 @@ - (BOOL)handleFile:(NSString *)theFile { + if ([EmuThread active]) { + return NO; + } if (![self window]) { [NSBundle loadNibNamed:@"PcsxrMemCardDocument" owner:self]; } - [cardPath setObjectValue:[theFile lastPathComponent]]; + [cardPath setObjectValue:[[NSFileManager defaultManager] displayNameAtPath:theFile]]; [NSApp runModalForWindow:[self window]]; diff --git a/macosx/PcsxrPluginHandler.m b/macosx/PcsxrPluginHandler.m index 7fde32c9..07ecd3b2 100755 --- a/macosx/PcsxrPluginHandler.m +++ b/macosx/PcsxrPluginHandler.m @@ -7,6 +7,7 @@ // #import "PcsxrPluginHandler.h" +#import "EmuThread.h" #import "ARCBridge.h" @implementation PcsxrPluginHandler @@ -55,6 +56,10 @@ - (BOOL)handleFile:(NSString *)theFile { + if ([EmuThread active]) { + return NO; + } + if (![self window]) [NSBundle loadNibNamed:@"AddPluginSheet" owner:self]; |