summaryrefslogtreecommitdiff
path: root/macosx/PcsxController.m
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2009-11-04 09:20:55 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2009-11-04 09:20:55 +0000
commit51e9552e84921787933266157e3eeac6a4bd99ed (patch)
tree1bc54a5d5dbb31f134f172043f4ba63840ad1614 /macosx/PcsxController.m
parentb3f057b0193080489af70c2c39f867177280c7bf (diff)
downloadpcsxr-51e9552e84921787933266157e3eeac6a4bd99ed.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@35429 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxController.m')
-rw-r--r--macosx/PcsxController.m8
1 files changed, 4 insertions, 4 deletions
diff --git a/macosx/PcsxController.m b/macosx/PcsxController.m
index a7e5f313..f6dbc124 100644
--- a/macosx/PcsxController.m
+++ b/macosx/PcsxController.m
@@ -154,11 +154,11 @@ NSString *saveStatePath;
[menuItem setState:([EmuThread isPaused] ? NSOnState : NSOffState)];
}
- if ([menuItem action] == @selector(pause:) || [menuItem action] == @selector(freeze:) ||
- [menuItem action] == @selector(fullscreen:))
+ if ([menuItem action] == @selector(pause:) || [menuItem action] == @selector(fullscreen:))
return [EmuThread active];
- if ([menuItem action] == @selector(reset:) || [menuItem action] == @selector(ejectCD:))
+ if ([menuItem action] == @selector(reset:) || [menuItem action] == @selector(ejectCD:) ||
+ [menuItem action] == @selector(freeze:))
return [EmuThread active] && ![EmuThread isRunBios];
if ([menuItem action] == @selector(runCD:) || [menuItem action] == @selector(runIso:) ||
@@ -174,7 +174,7 @@ NSString *saveStatePath;
}
if ([menuItem action] == @selector(defrost:)) {
- if (![EmuThread active])
+ if (![EmuThread active] || [EmuThread isRunBios])
return NO;
NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, [menuItem tag]];