X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd3e8827dd468030e34df0bde66fc6c38c4fa9b4..4e209a2064a2b6d97b810ccab66859ab30b4bf2a:/src/cocoa/app.mm?ds=sidebyside

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index d5c70c6f32..fc253712db 100644
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -41,6 +41,7 @@
 #import <Foundation/NSRunLoop.h>
 #import <Foundation/NSArray.h>
 #import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSThread.h>
 
 // ----------------------------------------------------------------------------
 // globals
@@ -133,6 +134,7 @@ END_EVENT_TABLE()
 bool wxApp::Initialize(int& argc, wxChar **argv)
 {
     wxAutoNSAutoreleasePool pool;
+    m_cocoaMainThread = [NSThread currentThread];
     // Mac OS X passes a process serial number command line argument when
     // the application is launched from the Finder. This argument must be
     // removed from the command line arguments before being handled by the
@@ -168,7 +170,6 @@ void wxApp::CleanUp()
 wxApp::wxApp()
 {
     m_topWindow = NULL;
-    wxTheApp = this;
 
     m_isIdle = true;
 #if WXWIN_COMPATIBILITY_2_2
@@ -182,6 +183,12 @@ wxApp::wxApp()
 
 void wxApp::CocoaInstallIdleHandler()
 {
+    // If we're not the main thread, don't install the idle handler
+    if(m_cocoaMainThread != [NSThread currentThread])
+    {
+        wxLogDebug("Attempt to install idle handler from secondary thread");
+        return;
+    }
     // If we're supposed to be stopping, don't add more idle events
     if(![m_cocoaApp isRunning])
         return;