From e66ba25d49a90a20e2465cadeef8e2e83ce291bc Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 10 Jan 2013 04:21:36 +0000
Subject: 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
---
 macosx/PcsxrPlugin.m                                                  | 2 ++
 macosx/plugins/DFCdrom/macsrc/PluginConfigController.m                | 2 +-
 macosx/plugins/DFInput/macsrc/PadController.m                         | 4 ++--
 macosx/plugins/DFNet/macsrc/PluginConfigController.m                  | 4 ----
 macosx/plugins/DFSound/macsrc/PluginController.m                      | 2 +-
 macosx/plugins/DFXVideo/macsrc/PluginConfigController.m               | 2 +-
 .../plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m  | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/macosx/PcsxrPlugin.m b/macosx/PcsxrPlugin.m
index 97e3fbc6..b311c503 100755
--- a/macosx/PcsxrPlugin.m
+++ b/macosx/PcsxrPlugin.m
@@ -319,6 +319,7 @@
     [NSThread detachNewThreadSelector:@selector(runCommand:) toTarget:self 
             withObject:arg];
     //NOTE: the runCommand releases the arg command. Probably not the best way to do it...
+    //This is not an issue with ARC (64-bit) code
 }
 
 - (void)configureAs:(int)aType
@@ -334,6 +335,7 @@
     [NSThread detachNewThreadSelector:@selector(runCommand:) toTarget:self 
             withObject:arg];
     //NOTE: the runCommand releases the arg command. Probably not the best way to do it...
+    //This is not an issue with ARC (64-bit) code
 }
 
 - (NSString *)displayVersion
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()
-- 
cgit v1.2.3