From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 3 Apr 2002 00:13:48 +0000 (+0000)
Subject: fixed a race condition resulting in returning incorrect thread exit code
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/10671c679165dd40b32f118b0ebca5281496f147?ds=sidebyside

fixed a race condition resulting in returning incorrect thread exit code


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index 7a42d2e60e..c516a161d7 100644
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -1135,12 +1135,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() )
     {
@@ -1151,9 +1157,6 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
         delete this;
     }
 
-    wxASSERT_MSG( (DWORD)rc != STILL_ACTIVE,
-                  wxT("thread must be already terminated.") );
-
     if ( pRc )
         *pRc = rc;