diff options
| -rw-r--r-- | macosx/Pcsxr.xcodeproj/project.pbxproj | 3 | ||||
| -rwxr-xr-x | macosx/plugins/Bladesio1/macsrc/PluginConfigController.m | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj index 0261749a..dab34101 100644 --- a/macosx/Pcsxr.xcodeproj/project.pbxproj +++ b/macosx/Pcsxr.xcodeproj/project.pbxproj @@ -2998,6 +2998,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = NO; CLANG_WARN_EMPTY_BODY = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3015,6 +3016,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = NO; CLANG_WARN_EMPTY_BODY = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; @@ -3224,6 +3226,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + "CLANG_ENABLE_OBJC_ARC[arch=x86_64]" = NO; CLANG_WARN_EMPTY_BODY = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; 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; } |