typo fixed: should be lpthread, not -lpthread in THREAD_OPTS

[wxWidgets.git] / src / msw / thread.cpp

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 7a42d2e60e0fceddac1372020a5fef241877f7ad..e2c76f9389403c4964138f1eb591905d9e6a4837 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -371,6 +371,8 @@ private:
     wxMutex& m_mutex;
 
     wxSemaphore m_semaphore;
     wxMutex& m_mutex;
 
     wxSemaphore m_semaphore;

+
+    DECLARE_NO_COPY_CLASS(wxConditionInternal)

 };
 
 wxConditionInternal::wxConditionInternal(wxMutex& mutex)
 };
 
 wxConditionInternal::wxConditionInternal(wxMutex& mutex)


@@ -1135,12 +1137,18 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
         }
     }
 
         }
     }
 

-    if ( !::GetExitCodeThread(hThread, (LPDWORD)&rc) )
+    // although the thread might be already in the EXITED state it might not
+    // have terminated yet and so we are not sure that it has actually
+    // terminated if the "if" above hadn't been taken
+    do

     {
     {

-        wxLogLastError(wxT("GetExitCodeThread"));
+        if ( !::GetExitCodeThread(hThread, (LPDWORD)&rc) )
+        {
+            wxLogLastError(wxT("GetExitCodeThread"));

 
 

-        rc = (ExitCode)-1;
-    }
+            rc = (ExitCode)-1;
+        }
+    } while ( (DWORD)rc == STILL_ACTIVE );

 
     if ( IsDetached() )
     {
 
     if ( IsDetached() )
     {


@@ -1151,9 +1159,6 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
         delete this;
     }
 
         delete this;
     }
 

-    wxASSERT_MSG( (DWORD)rc != STILL_ACTIVE,
-                  wxT("thread must be already terminated.") );
-

     if ( pRc )
         *pRc = rc;
 
     if ( pRc )
         *pRc = rc;