diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-11-04 02:46:27 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-11-04 02:46:27 +0000 |
| commit | 559fd026bb57e0d71615b237c37a31f287af5940 (patch) | |
| tree | ab44f09ca16f2e840c6a544a2fba787577c99960 /macosx/PcsxController.m | |
| parent | a2da60aec08bb90c8e55f9ff5178701a309dbb9c (diff) | |
| download | pcsxr-559fd026bb57e0d71615b237c37a31f287af5940.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@35397 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxController.m')
| -rw-r--r-- | macosx/PcsxController.m | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/macosx/PcsxController.m b/macosx/PcsxController.m index 98792f9f..d4e82b13 100644 --- a/macosx/PcsxController.m +++ b/macosx/PcsxController.m @@ -123,8 +123,10 @@ NSString *saveStatePath; } } -- (IBAction)runExe:(id)sender +- (IBAction)runBios:(id)sender { + cdrfilename[0] = '\0'; + [EmuThread runBios]; } - (IBAction)freeze:(id)sender @@ -157,12 +159,15 @@ NSString *saveStatePath; [menuItem action] == @selector(fullscreen:)) return [EmuThread active]; - if ([menuItem action] == @selector(runCD:) || [menuItem action] == @selector(runIso:)) { - if (preferenceWindow != nil) { - if ([preferenceWindow isVisible]) { + if ([menuItem action] == @selector(runCD:) || [menuItem action] == @selector(runIso:) || + [menuItem action] == @selector(runBios:)) { + if (preferenceWindow != nil) + if ([preferenceWindow isVisible]) return NO; - } - } + + if ([menuItem action] == @selector(runBios:) && strcmp(Config.Bios, "HLE") == 0) + return NO; + return ![EmuThread active]; } |