Make the bladesio1 driver work on OS X:

Fix a bug where the wrong plug-in was being used in place of sio1, causing PCSXR to complain.
Fix a bug where bladesio1's config window would cause PCSXR to crash.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85936 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 100 insertions, 93 deletions

diff --git a/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib b/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib
index 91239800..2ae3f8cf 100644
--- a/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib
+++ b/macosx/plugins/Bladesio1/English.lproj/Bladesio1PluginConfig.xib
@@ -1315,78 +1315,78 @@
 						<reference key="parent" ref="497434569"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">224</int>
-						<reference key="object" ref="406789566"/>
-						<reference key="parent" ref="537116407"/>
+						<int key="objectID">253</int>
+						<reference key="object" ref="1036876179"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">225</int>
-						<reference key="object" ref="462314221"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">246</int>
+						<reference key="object" ref="842829921"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">226</int>
-						<reference key="object" ref="290329374"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">245</int>
+						<reference key="object" ref="674129625"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">227</int>
-						<reference key="object" ref="885502674"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">244</int>
+						<reference key="object" ref="870181243"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">228</int>
-						<reference key="object" ref="318007249"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">252</int>
+						<reference key="object" ref="499697857"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">229</int>
-						<reference key="object" ref="666704347"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">248</int>
+						<reference key="object" ref="447479180"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">230</int>
-						<reference key="object" ref="335368693"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">247</int>
+						<reference key="object" ref="290637930"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">232</int>
-						<reference key="object" ref="380664884"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">251</int>
+						<reference key="object" ref="427946131"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">233</int>
-						<reference key="object" ref="60527276"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">249</int>
+						<reference key="object" ref="906287637"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">234</int>
-						<reference key="object" ref="145126621"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">243</int>
+						<reference key="object" ref="391278904"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">235</int>
-						<reference key="object" ref="132721671"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">250</int>
+						<reference key="object" ref="900601962"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="89759382"/>
-						<reference key="parent" ref="82652069"/>
+						<int key="objectID">242</int>
+						<reference key="object" ref="919721277"/>
+						<reference key="parent" ref="127793487"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">237</int>
-						<reference key="object" ref="227679458"/>
+						<int key="objectID">256</int>
+						<reference key="object" ref="40692612"/>
 						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">238</int>
-						<reference key="object" ref="887624534"/>
+						<int key="objectID">239</int>
+						<reference key="object" ref="846592300"/>
 						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="846592300"/>
+						<int key="objectID">233</int>
+						<reference key="object" ref="60527276"/>
 						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -1395,84 +1395,84 @@
 						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">241</int>
-						<reference key="object" ref="506743589"/>
+						<int key="objectID">238</int>
+						<reference key="object" ref="887624534"/>
 						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">242</int>
-						<reference key="object" ref="919721277"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">236</int>
+						<reference key="object" ref="89759382"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">243</int>
-						<reference key="object" ref="391278904"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">234</int>
+						<reference key="object" ref="145126621"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">244</int>
-						<reference key="object" ref="870181243"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">228</int>
+						<reference key="object" ref="318007249"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">245</int>
-						<reference key="object" ref="674129625"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">227</int>
+						<reference key="object" ref="885502674"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">247</int>
-						<reference key="object" ref="290637930"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">235</int>
+						<reference key="object" ref="132721671"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">250</int>
-						<reference key="object" ref="900601962"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">230</int>
+						<reference key="object" ref="335368693"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">251</int>
-						<reference key="object" ref="427946131"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">229</int>
+						<reference key="object" ref="666704347"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">252</int>
-						<reference key="object" ref="499697857"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">237</int>
+						<reference key="object" ref="227679458"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">253</int>
-						<reference key="object" ref="1036876179"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">232</int>
+						<reference key="object" ref="380664884"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">254</int>
-						<reference key="object" ref="245057345"/>
-						<reference key="parent" ref="45529240"/>
+						<int key="objectID">226</int>
+						<reference key="object" ref="290329374"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">255</int>
-						<reference key="object" ref="997131426"/>
-						<reference key="parent" ref="83047673"/>
+						<int key="objectID">241</int>
+						<reference key="object" ref="506743589"/>
+						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">256</int>
-						<reference key="object" ref="40692612"/>
+						<int key="objectID">225</int>
+						<reference key="object" ref="462314221"/>
 						<reference key="parent" ref="82652069"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">246</int>
-						<reference key="object" ref="842829921"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">255</int>
+						<reference key="object" ref="997131426"/>
+						<reference key="parent" ref="83047673"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">249</int>
-						<reference key="object" ref="906287637"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">254</int>
+						<reference key="object" ref="245057345"/>
+						<reference key="parent" ref="45529240"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">248</int>
-						<reference key="object" ref="447479180"/>
-						<reference key="parent" ref="127793487"/>
+						<int key="objectID">224</int>
+						<reference key="object" ref="406789566"/>
+						<reference key="parent" ref="537116407"/>
 					</object>
 				</array>
 			</object>
diff --git a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
index dbc85174..b1b4c08e 100755
--- a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
+++ b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
@@ -74,12 +74,19 @@ void AboutDlgProc()
 
 void ConfDlgProc()
 {
-	NSWindow *window;
-
-	if (windowController == nil) {
-		windowController = [[PluginConfigController alloc] initWithWindowNibName:@"Bladesio1PluginConfig"];
+	__block NSWindow *window;
+	__block PluginConfigController *tmpWindowController = nil;
+	
+	//We need this block due to the xib's use of auto layout
+	dispatch_sync(dispatch_get_main_queue(), ^{
+		if (windowController == nil) {
+			tmpWindowController = [[PluginConfigController alloc] initWithWindowNibName:@"Bladesio1PluginConfig"];
+		}
+		window = [(windowController ? windowController : tmpWindowController) window];
+	});
+	if (!windowController) {
+		windowController = tmpWindowController;
 	}
-	window = [windowController window];
 
 	[windowController loadValues];