X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad816ba53975de78ea29acdc40f05217137c8ad3..05ac7ac5785ef0ddb1bd04585f3c59c5d53089be:/src/mac/carbon/thread.cpp diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp index 5ce510da31..474b92a22f 100644 --- a/src/mac/carbon/thread.cpp +++ b/src/mac/carbon/thread.cpp @@ -99,7 +99,7 @@ public: { if ( m_locked > 0 ) { - wxLogDebug(_T("Warning: freeing a locked mutex (%d locks)."), m_locked); + wxLogDebug(_T("Warning: freeing a locked mutex (%ld locks)."), m_locked); } } @@ -523,11 +523,11 @@ void wxThread::Yield() void wxThread::Sleep(unsigned long milliseconds) { - clock_t start = clock() ; - do - { - YieldToAnyThread() ; - } while( clock() - start < milliseconds / CLOCKS_PER_SEC ) ; + clock_t start = clock(); + do + { + YieldToAnyThread(); + } while( clock() - start < (milliseconds * CLOCKS_PER_SEC) / 1000 ) ; } int wxThread::GetCPUCount() @@ -576,7 +576,10 @@ wxThread::wxThread(wxThreadKind kind) wxThread::~wxThread() { s_threads.Remove( (void*) this ) ; - delete m_internal; + if (m_internal != NULL) { + delete m_internal; + m_internal = NULL; + } } // create/start thread