Only set the ISO in the disc handler when the emulator is running if we are using an ISO.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82825 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 8 insertions, 4 deletions

diff --git a/macosx/PcsxrDiscHandler.m b/macosx/PcsxrDiscHandler.m
index 8d83c8f9..025f5fdb 100755
--- a/macosx/PcsxrDiscHandler.m
+++ b/macosx/PcsxrDiscHandler.m
@@ -27,15 +27,19 @@
 - (BOOL)handleFile:(NSString *)theFile
 {
 	PcsxrController *appDelegate = [NSApp delegate];
-	[[appDelegate recentItems] addRecentItem:[NSURL fileURLWithPath:theFile]];
 	if ([EmuThread active] == YES) {
-		SetCdOpenCaseTime(time(NULL) + 2);
-		SetIsoFile([theFile fileSystemRepresentation]);
-		//[EmuThread reset];
+		if (UsingIso()) {
+			SetCdOpenCaseTime(time(NULL) + 2);
+			SetIsoFile([theFile fileSystemRepresentation]);
+			//[EmuThread reset];
+		} else {
+			return NO;
+		}
 	} else {
 		SetIsoFile([theFile fileSystemRepresentation]);
 		[EmuThread run];
 	}
+	[[appDelegate recentItems] addRecentItem:[NSURL fileURLWithPath:theFile]];
 	return YES;
 }