summaryrefslogtreecommitdiff
path: root/macosx/PcsxrMemCardHandler.m
diff options
context:
space:
mode:
Diffstat (limited to 'macosx/PcsxrMemCardHandler.m')
-rwxr-xr-xmacosx/PcsxrMemCardHandler.m6
1 files changed, 5 insertions, 1 deletions
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]];