X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..4a9dba0e561d2485d9235eab7b51aac8729f1b10:/src/unix/threadpsx.cpp?ds=inline

diff --git a/src/unix/threadpsx.cpp b/src/unix/threadpsx.cpp
index b4b91685b9..89bc5109f7 100644
--- a/src/unix/threadpsx.cpp
+++ b/src/unix/threadpsx.cpp
@@ -532,7 +532,7 @@ wxSemaError wxSemaphoreInternal::WaitTimeout(unsigned long milliseconds)
             return wxSEMA_TIMEOUT;
         }
 
-        if ( m_cond.Wait(remainingTime) != wxCOND_NO_ERROR )
+        if ( m_cond.WaitTimeout(remainingTime) != wxCOND_NO_ERROR )
             return wxSEMA_MISC_ERROR;
     }
 
@@ -988,8 +988,8 @@ int wxThread::GetCPUCount()
         wxString s;
         if ( file.ReadAll(&s) )
         {
-            // (ab)use Replace() to find the number of "processor" strings
-            size_t count = s.Replace(_T("processor"), _T(""));
+            // (ab)use Replace() to find the number of "processor: num" strings
+            size_t count = s.Replace(_T("processor\t:"), _T(""));
             if ( count > 0 )
             {
                 return count;