summaryrefslogtreecommitdiff
path: root/macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-07-11 02:36:29 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-07-11 02:36:29 +0000
commit6d2da330ce6a8822d69295f2cb470494a68f6dcf (patch)
tree5fbf9083800de36fc11f2229a06fc00977ab6894 /macosx/plugins/Bladesio1/macsrc/PluginConfigController.m
parent04f58e9cbc7396f7a5c9b1de2a9a4640540f7818 (diff)
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
Diffstat (limited to 'macosx/plugins/Bladesio1/macsrc/PluginConfigController.m')
-rwxr-xr-xmacosx/plugins/Bladesio1/macsrc/PluginConfigController.m9
1 files changed, 7 insertions, 2 deletions
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;
}