From 6d2da330ce6a8822d69295f2cb470494a68f6dcf Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 11 Jul 2013 02:36:29 +0000
Subject: Don't build the mini-SDL library with ARC.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85966 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/plugins/Bladesio1/macsrc/PluginConfigController.m | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'macosx/plugins/Bladesio1/macsrc/PluginConfigController.m')

diff --git a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
index b1b4c08e..584f58a6 100755
--- a/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
+++ b/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
@@ -78,12 +78,17 @@ void ConfDlgProc()
 	__block PluginConfigController *tmpWindowController = nil;
 	
 	//We need this block due to the xib's use of auto layout
-	dispatch_sync(dispatch_get_main_queue(), ^{
+	dispatch_block_t getWindowBlock = ^{
 		if (windowController == nil) {
 			tmpWindowController = [[PluginConfigController alloc] initWithWindowNibName:@"Bladesio1PluginConfig"];
 		}
 		window = [(windowController ? windowController : tmpWindowController) window];
-	});
+	};
+	if ([NSThread isMainThread]) {
+		getWindowBlock();
+	} else {
+		dispatch_sync(dispatch_get_main_queue(), getWindowBlock);
+	}
 	if (!windowController) {
 		windowController = tmpWindowController;
 	}
-- 
cgit v1.2.3