Applied patch [ 1380544 ] wxCondition::WaitTimeout() return value when timeout occurs

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

diff --git a/include/wx/thrimpl.cpp b/include/wx/thrimpl.cpp
index 54f6dd2bfde516728c0c8c6d785da50e8920580f..c1f13ec3d9f1998b97a93bd9ac3c65eb6cb6394b 100644 (file)
--- a/include/wx/thrimpl.cpp
+++ b/include/wx/thrimpl.cpp
@@ -133,7 +133,12 @@ wxCondError wxConditionInternal::Wait()
     wxSemaError err = m_semaphore.Wait();
     m_mutex.Lock();
 
     wxSemaError err = m_semaphore.Wait();
     m_mutex.Lock();
 

-    return err == wxSEMA_NO_ERROR ? wxCOND_NO_ERROR : wxCOND_MISC_ERROR;
+    if ( err == wxSEMA_NO_ERROR )
+        return wxCOND_NO_ERROR;
+    else if ( err == wxSEMA_TIMEOUT )
+        return wxCOND_TIMEOUT;
+    else
+        return wxCOND_MISC_ERROR;

 }
 
 wxCondError wxConditionInternal::WaitTimeout(unsigned long milliseconds)
 }
 
 wxCondError wxConditionInternal::WaitTimeout(unsigned long milliseconds)