diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-27 01:35:59 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-27 01:35:59 +0000 |
| commit | 10604cab8913a49d0c4b8c72f85b59054bac0dcb (patch) | |
| tree | 82cf2b2e500991fe328a564e8235580e9c6ab02a /macosx/PcsxrController.m | |
| parent | 61850440ef1bfbfa64c9462ccbbd210443a7d4d5 (diff) | |
| download | pcsxr-10604cab8913a49d0c4b8c72f85b59054bac0dcb.tar.gz | |
Resized the Memory Card manager for Mac OS X.
Emulator can't be started if the Memory Card manager window is open on Mac OS X.
Center the Memory Card manager window when it shows up.
The Memory Card manager will refresh when the window is brought back to the front (It used to be that closing the window, then re-opening it wouldn't reload the contents of the cards).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72657 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrController.m')
| -rw-r--r-- | macosx/PcsxrController.m | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m index eff82832..bfea695a 100644 --- a/macosx/PcsxrController.m +++ b/macosx/PcsxrController.m @@ -166,6 +166,11 @@ NSString *saveStatePath; if ([preferenceWindow isVisible]) return NO; + if (preferencesController != nil) { + if ([preferencesController memoryCardWindowIsVisible] == YES) + return NO; + } + if ([menuItem action] == @selector(runBios:) && strcmp(Config.Bios, "HLE") == 0) return NO; |