diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-10-31 01:25:35 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-10-31 01:25:35 +0000 |
| commit | f4092dc959d0380d3a440d0bcfcbeef082235916 (patch) | |
| tree | 077e55a4f0ef32737be1f7505eb2afd155577208 | |
| parent | 239ab668a152342afd89f8ef8d41bee525b4c0fa (diff) | |
| download | pcsxr-f4092dc959d0380d3a440d0bcfcbeef082235916.tar.gz | |
Break out of the file handling loop when we reach a handle.
Work on the Disc handler, making it say that the disc cover was open when loading another disc.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@80820 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | macosx/PcsxrController.m | 2 | ||||
| -rw-r--r-- | macosx/PcsxrDiscHandler.m | 10 |
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; } |