Merge remote branch 'libcec-public/master'

[deb_libcec.git] / src / lib / platform / threads / threads.h

diff --git a/src/lib/platform/threads/threads.h b/src/lib/platform/threads/threads.h
index 6cc240644dc5659fd2bfea838cabb975fac98a3a..1f62dcf0c1247511b24d6d7830416699a3a4c5d0 100644 (file)
--- a/src/lib/platform/threads/threads.h
+++ b/src/lib/platform/threads/threads.h
@@ -41,16 +41,15 @@ namespace PLATFORM
     CThread(void) :
         m_bStop(false),
         m_bRunning(false),
-        m_bStopped(false) {}
+        m_bStopped(false),
+        m_thread(NULL) {}
 
     virtual ~CThread(void)
     {
       StopThread(0);
       void *retVal = NULL;
-      ThreadsWait(m_thread, &retVal);
-      #if defined(__WINDOWS__)
-      (void *)retVal; //"unreferenced local variable" warning
-      #endif
+      if (m_thread)
+        ThreadsWait(m_thread, &retVal);
     }
 
     static void *ThreadHandler(CThread *thread)