diff --git a/lib/thread.cpp b/lib/thread.cpp
index 30a70f863..af355524a 100644
--- a/lib/thread.cpp
+++ b/lib/thread.cpp
@@ -31,10 +31,10 @@ Thread::Thread() : m_tid(0), m_running(0), m_detached(0) {}
 
 Thread::~Thread()
 {
-    if (m_running == 1 && m_detached == 0) {
-        pthread_detach(m_tid);
-    }
     if (m_running == 1) {
+        if (m_detached == 0) {
+             pthread_detach(m_tid);
+        }
         pthread_cancel(m_tid);
     }
 }