1 files changed, 9 insertions, 8 deletions

diff --git a/src/3rdParty/efsw/platform/posix/ThreadImpl.cpp b/src/3rdParty/efsw/platform/posix/ThreadImpl.cpp
index e0ae84f..772fbc9 100755..100644
--- a/src/3rdParty/efsw/platform/posix/ThreadImpl.cpp
+++ b/src/3rdParty/efsw/platform/posix/ThreadImpl.cpp
@@ -5,11 +5,10 @@
 
 #include <cassert>
 #include <efsw/Debug.hpp>
-#include <iostream>
 
 namespace efsw { namespace Platform {
 
-ThreadImpl::ThreadImpl( Thread* owner ) : mIsActive( false ) {
+ThreadImpl::ThreadImpl( efsw::Thread* owner ) : mIsActive( false ) {
         mIsActive = pthread_create( &mThread, NULL, &ThreadImpl::entryPoint, owner ) == 0;
 
         if ( !mIsActive ) {
@@ -17,14 +16,16 @@ ThreadImpl::ThreadImpl( Thread* owner ) : mIsActive( false ) {
         }
 }
 
+ThreadImpl::~ThreadImpl() {
+        terminate();
+}
+
 void ThreadImpl::wait() {
         // Wait for the thread to finish, no timeout
         if ( mIsActive ) {
                 assert( pthread_equal( pthread_self(), mThread ) == 0 );
 
-                pthread_join( mThread, NULL );
-
-                mIsActive = false; // Reset the thread state
+                mIsActive = pthread_join( mThread, NULL ) != 0;
         }
 }
 
@@ -41,14 +42,14 @@ void ThreadImpl::terminate() {
 }
 
 void* ThreadImpl::entryPoint( void* userData ) {
-        // The Thread instance is stored in the user data
-        Thread* owner = static_cast<Thread*>( userData );
-
 // Tell the thread to handle cancel requests immediatly
 #ifdef PTHREAD_CANCEL_ASYNCHRONOUS
         pthread_setcanceltype( PTHREAD_CANCEL_ASYNCHRONOUS, NULL );
 #endif
 
+        // The Thread instance is stored in the user data
+        Thread* owner = static_cast<Thread*>( userData );
+
         // Forward to the owner
         owner->run();