summaryrefslogtreecommitdiff
path: root/macosx/plugins
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-01-10 04:21:36 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-01-10 04:21:36 +0000
commite66ba25d49a90a20e2465cadeef8e2e83ce291bc (patch)
tree833c327c717ba0c365c7f37de06a61997fcb616b /macosx/plugins
parentea7e430219d044b73473dd2782e741f8582688f9 (diff)
downloadpcsxr-e66ba25d49a90a20e2465cadeef8e2e83ce291bc.tar.gz
Setting the Plug-in window controllers' initial value to nil.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@82168 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins')
-rwxr-xr-xmacosx/plugins/DFCdrom/macsrc/PluginConfigController.m2
-rwxr-xr-xmacosx/plugins/DFInput/macsrc/PadController.m4
-rwxr-xr-xmacosx/plugins/DFNet/macsrc/PluginConfigController.m4
-rwxr-xr-xmacosx/plugins/DFSound/macsrc/PluginController.m2
-rwxr-xr-xmacosx/plugins/DFXVideo/macsrc/PluginConfigController.m2
-rwxr-xr-xmacosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m2
6 files changed, 6 insertions, 10 deletions
diff --git a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
index 19b5c872..b510eead 100755
--- a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
@@ -25,7 +25,7 @@
#define APP_ID @"net.pcsxr.DFCdrom"
#define PrefsKey APP_ID @" Settings"
-static PluginConfigController *windowController;
+static PluginConfigController *windowController = nil;
void AboutDlgProc()
{
diff --git a/macosx/plugins/DFInput/macsrc/PadController.m b/macosx/plugins/DFInput/macsrc/PadController.m
index 88fdeb83..1479b35a 100755
--- a/macosx/plugins/DFInput/macsrc/PadController.m
+++ b/macosx/plugins/DFInput/macsrc/PadController.m
@@ -23,8 +23,8 @@
#import "PadController.h"
#include "pad.h"
-static NSWindow *padWindow;
-static PadController *padController;
+static NSWindow *padWindow = nil;
+static PadController *padController = nil;
#define APP_ID @"net.pcsxr.DFInputPlugin"
diff --git a/macosx/plugins/DFNet/macsrc/PluginConfigController.m b/macosx/plugins/DFNet/macsrc/PluginConfigController.m
index b0444e9a..9ddf7417 100755
--- a/macosx/plugins/DFNet/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFNet/macsrc/PluginConfigController.m
@@ -100,8 +100,6 @@ void ReadConfig()
- (IBAction)cancel:(id)sender
{
[self close];
- [windowController release];
- windowController = nil;
}
- (IBAction)ok:(id)sender
@@ -121,8 +119,6 @@ void ReadConfig()
ReadConfig();
[self close];
- [windowController release];
- windowController = nil;
}
- (void)loadValues
diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m
index dac102f5..536692e7 100755
--- a/macosx/plugins/DFSound/macsrc/PluginController.m
+++ b/macosx/plugins/DFSound/macsrc/PluginController.m
@@ -41,7 +41,7 @@ extern const char* PLUGLOC(char* toloc);
#endif
#define PrefsKey APP_ID @" Settings"
-static PluginController *pluginController;
+static PluginController *pluginController = nil;
char * pConfigFile=NULL;
void DoAbout()
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
index a36e90d7..4865a99e 100755
--- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
@@ -39,7 +39,7 @@ extern const char* PLUGLOC(char* toloc);
#define APP_ID @"net.sf.peops.SoftGpuGLPlugin"
#define PrefsKey APP_ID @" Settings"
-static PluginConfigController *windowController;
+static PluginConfigController *windowController = nil;
char * pConfigFile=NULL;
void AboutDlgProc()
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
index 8de12e3e..41fdb7b7 100755
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
@@ -46,7 +46,7 @@ extern const char* PLUGLOC(char* toloc);
#define APP_ID @"net.sf.peops.GpuOpenGLPlugin"
#define PrefsKey APP_ID @" Settings"
-static NetSfPeopsOpenGLPluginConfigController *windowController;
+static NetSfPeopsOpenGLPluginConfigController *windowController = nil;
char * pConfigFile=NULL;
void AboutDlgProc()