From d663bbeb7c6958388d515c196bc73956b574ffbb Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Fri, 26 Jul 2013 19:55:10 +0000 Subject: fixing the wrong project being non-arc. Add a convinience function for running blocks on the main thread syncronously. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86262 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/plugins/DFNet/macsrc/SockDialog.m | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'macosx/plugins/DFNet/macsrc') diff --git a/macosx/plugins/DFNet/macsrc/SockDialog.m b/macosx/plugins/DFNet/macsrc/SockDialog.m index 065afc26..77a09f04 100755 --- a/macosx/plugins/DFNet/macsrc/SockDialog.m +++ b/macosx/plugins/DFNet/macsrc/SockDialog.m @@ -40,12 +40,20 @@ void SysMessage(const char *fmt, ...) } } +static inline void RunOnMainThreadSync(dispatch_block_t block) +{ + if ([NSThread isMainThread]) { + block(); + } else { + dispatch_sync(dispatch_get_main_queue(), block); + } +} static SockDialog *globalSock = nil; void sockCreateWaitDlg() { - dispatch_sync(dispatch_get_main_queue(), ^{ + RunOnMainThreadSync(^{ if (globalSock == nil) { globalSock = [[SockDialog alloc] init]; } @@ -70,7 +78,7 @@ long sockOpen() void sockDestroyWaitDlg() { - dispatch_sync(dispatch_get_main_queue(), ^{ + RunOnMainThreadSync(^{ if (globalSock != nil) { [globalSock close]; -- cgit v1.2.3