X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93b14e80262d796a9c618842de3456fa07a1357b..1f919f38c80cd29a1852afaa5f9e1a135f6c5d96:/src/mac/carbon/thread.cpp

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index 8aebe3bde2..84de36ee2b 100644
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -962,7 +962,7 @@ private:
 	MPQueueID	    m_notifyQueueId;    // its notification queue
 
     wxThreadState m_state;              // see wxThreadState enum
-    int           m_prio;               // in wxWindows units: from 0 to 100
+    int           m_prio;               // in wxWidgets units: from 0 to 100
 
     // this flag is set when the thread should terminate
     bool m_cancelled;
@@ -1092,8 +1092,8 @@ void wxThreadInternal::SetPriority( int priority)
 	if ( m_tid)
     {
 		// Mac priorities range from 1 to 10,000, with a default of 100.
-		// wxWindows priorities range from 0 to 100 with a default of 50.
-		// We can map wxWindows to Mac priorities easily by assuming
+		// wxWidgets priorities range from 0 to 100 with a default of 50.
+		// We can map wxWidgets to Mac priorities easily by assuming
 		// the former uses a logarithmic scale.
 		const unsigned int macPriority = ( int)( exp( priority / 25.0 * log( 10.0)) + 0.5);
 		
@@ -1630,6 +1630,11 @@ void wxThreadModule::OnExit()
 {
     if ( gs_critsectGui )
     {
+        if ( !wxGuiOwnedByMainThread() )
+        {
+            gs_critsectGui->Enter();
+            gs_bGuiOwnedByMainThread = true;
+        }
         gs_critsectGui->Leave();
         delete gs_critsectGui;
         gs_critsectGui = NULL;