Module: wine Branch: master Commit: cf73350d9ff3e689b1966548b49841252ca7d488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf73350d9ff3e689b1966548b4...
Author: Ken Thomases ken@codeweavers.com Date: Tue Apr 16 00:37:48 2013 -0500
loader: On Mac, if Wine is already on secondary thread, don't reserve it for the system frameworks.
---
libs/wine/loader.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 302e9c1..7af1233 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -761,6 +761,12 @@ static void apple_main_thread( void (*init_func)(void) ) CFRunLoopSourceContext source_context = { 0 }; CFRunLoopSourceRef source;
+ if (!pthread_main_np()) + { + init_func(); + return; + } + /* Multi-processing Services can get confused about the main thread if the * first time it's used is on a secondary thread. Use it here to make sure * that doesn't happen. */