diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-01-14 22:10:02 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-01-14 22:10:02 +0000 |
| commit | f04fe325fc0bc79969fe46eca16898aa04e139ed (patch) | |
| tree | 05721515c2ba1e82772a61b04da3fa9ada2cfcf5 /macosx/PcsxrController.m | |
| parent | fba17b7792445b0e97f4c10952950b4546b27f90 (diff) | |
| download | pcsxr-f04fe325fc0bc79969fe46eca16898aa04e139ed.tar.gz | |
Make sPluginList in PluginList.m unsafe-unretained so we can properly free it when other sources are done with it.
I didn't notice that the OS X app controller had a PluginList instance variable: use that instead of calling +[PluginList list].
A few other minor changes.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82281 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrController.m')
| -rwxr-xr-x | macosx/PcsxrController.m | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m index d312dd07..233dbb87 100755 --- a/macosx/PcsxrController.m +++ b/macosx/PcsxrController.m @@ -6,7 +6,6 @@ #import "PcsxrPluginHandler.h" #import "PcsxrDiscHandler.h" #import "PcsxrFreezeStateHandler.h" -#import "PluginList.h" #include "psxcommon.h" #include "plugins.h" #include "misc.h" @@ -111,9 +110,9 @@ NSString *saveStatePath; { SetIsoFile(NULL); if ([[NSUserDefaults standardUserDefaults] boolForKey:@"NetPlay"]) { - [[PluginList list] enableNetPlug]; + [pluginList enableNetPlug]; } else { - [[PluginList list] disableNetPlug]; + [pluginList disableNetPlug]; } [EmuThread run]; } @@ -137,7 +136,7 @@ NSString *saveStatePath; - (IBAction)runBios:(id)sender { SetIsoFile(NULL); - [[PluginList list] disableNetPlug]; + [pluginList disableNetPlug]; [EmuThread runBios]; } @@ -148,9 +147,9 @@ NSString *saveStatePath; SetIsoFile([[url path] fileSystemRepresentation]); } else { if ([[NSUserDefaults standardUserDefaults] boolForKey:@"NetPlay"]) { - [[PluginList list] enableNetPlug]; + [pluginList enableNetPlug]; } else { - [[PluginList list] disableNetPlug]; + [pluginList disableNetPlug]; } SetIsoFile((const char *)[[url path] fileSystemRepresentation]); [EmuThread run]; @@ -287,7 +286,6 @@ NSString *saveStatePath; + (void)setConfigFromDefaults { - NSEnumerator *enumerator; const char *str; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; |