summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-03-02 18:34:25 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-03-02 18:34:25 +0000
commit473ab832adf21e9e5e2b0df835794556096820c8 (patch)
tree0afca1030e79dbf5076ec51fc8a4bdb5148f9117
parentee1f58e13d68ad3d23fcaf1a2ff185e21c9a578d (diff)
downloadpcsxr-473ab832adf21e9e5e2b0df835794556096820c8.tar.gz
Only run the url if the emulator is running if we are using an ISO.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@83303 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rwxr-xr-xmacosx/PcsxrController.m8
1 files changed, 6 insertions, 2 deletions
diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m
index 3d18b8dc..8ba710c4 100755
--- a/macosx/PcsxrController.m
+++ b/macosx/PcsxrController.m
@@ -143,8 +143,12 @@ NSString *saveStatePath;
- (void)runURL:(NSURL*)url
{
if ([EmuThread active] == YES) {
- SetCdOpenCaseTime(time(NULL) + 2);
- SetIsoFile([[url path] fileSystemRepresentation]);
+ if (UsingIso()) {
+ SetCdOpenCaseTime(time(NULL) + 2);
+ SetIsoFile([[url path] fileSystemRepresentation]);
+ } else {
+ NSBeep();
+ }
} else {
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"NetPlay"]) {
[pluginList enableNetPlug];