1 files changed, 8 insertions, 5 deletions
diff --git a/macosx/PcsxrMemCardHandler.m b/macosx/PcsxrMemCardHandler.m
index ec216922..ae7ea0a3 100755
--- a/macosx/PcsxrMemCardHandler.m
+++ b/macosx/PcsxrMemCardHandler.m
@@ -43,6 +43,11 @@
     // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
 }
 
+- (NSString*)windowNibName
+{
+	return @"PcsxrMemCardDocument";
+}
+
 - (IBAction)setMemCard:(id)sender
 {
 	memChosen = [sender tag];
@@ -55,17 +60,15 @@
 	if ([EmuThread active]) {
 		return NO;
 	}
-	if (![self window]) {
-		[NSBundle loadNibNamed:@"PcsxrMemCardDocument" owner:self];
-	}
-	[cardPath setObjectValue:[[NSFileManager defaultManager] displayNameAtPath:theFile]];
+	
+	[[cardPath cell] setTitle:[[NSFileManager defaultManager] displayNameAtPath:theFile]];
 	
 	[NSApp runModalForWindow:[self window]];
 	
 	[[self window] orderOut:nil];
 	
 	if (memChosen != 0) {
-		[ConfigurationController setMemoryCard:(int)memChosen toPath:theFile];
+		[ConfigurationController setMemoryCard:memChosen toPath:theFile];
 	}
 	return YES;
 }