Ops. wxUSE_XXX and wxUSE_STREAMS are separated again :-)

[wxWidgets.git] / src / unix / threadpsx.cpp

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index aad7082be4d7ab0aa5f6342a5b2c28d388b977b8..c3a6ff6268926000bc4c4a1a76dd366e4ab6010a 100644 (file)
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -101,6 +101,7 @@ public:
 wxMutex::wxMutex()
 {
     p_internal = new wxMutexInternal;
+    
     pthread_mutex_init( &(p_internal->p_mutex), (const pthread_mutexattr_t*) NULL );
     m_locked = 0;
 }
@@ -668,6 +669,9 @@ wxThreadError wxThread::Resume()
 
 wxThread::ExitCode wxThread::Delete()
 {
+    if (IsPaused())
+      Resume();
+
     m_critsect.Enter();
     wxThreadState state = p_internal->GetState();
 
@@ -693,6 +697,8 @@ wxThread::ExitCode wxThread::Delete()
             // wait until the thread stops
             p_internal->Wait();
     }
+    //GL: As we must auto-destroy, the destruction must happen here.
+    delete this;
 
     return NULL;
 }
@@ -714,6 +720,8 @@ wxThreadError wxThread::Kill()
 
                 return wxTHREAD_MISC_ERROR;
             }
+           //GL: As we must auto-destroy, the destruction must happen here (2).
+           delete this;
 
             return wxTHREAD_NO_ERROR;
     }
@@ -850,7 +858,9 @@ void wxThreadModule::OnExit()
 
     for ( size_t n = 0u; n < count; n++ )
     {
-        gs_allThreads[n]->Delete();
+       // Delete calls the destructor which removes the current entry. We
+       // should only delete the first one each time.
+        gs_allThreads[0]->Delete();
     }
 
     // destroy GUI mutex