summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--macosx/PcsxrController.m2
-rw-r--r--macosx/PcsxrDiscHandler.m10
2 files changed, 10 insertions, 2 deletions
diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m
index 66861ada..20f4d93d 100644
--- a/macosx/PcsxrController.m
+++ b/macosx/PcsxrController.m
@@ -555,6 +555,8 @@ static NSString *HandleBinCue(NSString *toHandle)
}
if (canHandle) {
isHandled = [hand handleFile:HandleBinCue(filename)];
+ [hand release];
+ break;
}
[hand release];
diff --git a/macosx/PcsxrDiscHandler.m b/macosx/PcsxrDiscHandler.m
index 83a83e8d..86efdf73 100644
--- a/macosx/PcsxrDiscHandler.m
+++ b/macosx/PcsxrDiscHandler.m
@@ -24,8 +24,14 @@
- (BOOL)handleFile:(NSString *)theFile
{
- SetIsoFile([theFile fileSystemRepresentation]);
- [EmuThread run];
+ if ([EmuThread active] == TRUE) {
+ SetCdOpenCaseTime(time(NULL) + 2);
+ SetIsoFile([theFile fileSystemRepresentation]);
+ //[EmuThread reset];
+ } else {
+ SetIsoFile([theFile fileSystemRepresentation]);
+ [EmuThread run];
+ }
return YES;
}