X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fbase%2Fthread.cpp;h=1fda6a47a944efb23dd7e76a72cd7ba444991c0c;hp=58c4fd72619a1064f2971fe265a0f41d3df8c5b7;hb=36cca1d3f31265929ef3443999ab7fd242b4dae5;hpb=be6b92c9568ef62e88f517ad0a62edc32fc63d61

diff --git a/lib/base/thread.cpp b/lib/base/thread.cpp
index 58c4fd7..1fda6a4 100644
--- a/lib/base/thread.cpp
+++ b/lib/base/thread.cpp
@@ -9,12 +9,9 @@ void eThread::thread_completed(void *ptr)
 	eThread *p = (eThread*) ptr;
 	p->m_alive = 0;
 
-		/* recover state */
-	if (!p->m_state.value())
-	{
-		p->m_state.up();
-		ASSERT(p->m_state.value() == 1);
-	}
+		/* recover state in case thread was cancelled before calling hasStarted */
+	if (!p->m_started)
+		p->hasStarted();
 
 	p->thread_finished();
 }
@@ -48,6 +45,7 @@ int eThread::runAsync(int prio, int policy)
 	ASSERT(m_state.value() == 0);
 	
 	m_alive = 1;
+	m_started = 0;
 
 		/* start thread. */
 	pthread_attr_t attr;
@@ -60,7 +58,12 @@ int eThread::runAsync(int prio, int policy)
 		pthread_attr_setschedpolicy(&attr, policy);
 		pthread_attr_setschedparam(&attr, &p);
 	}
-	
+
+	if (the_thread) {
+		eDebug("old thread joined %d", pthread_join(the_thread, 0));
+		the_thread = 0;
+	}
+
 	if (pthread_create(&the_thread, &attr, wrapper, this))
 	{
 		pthread_attr_destroy(&attr);
@@ -71,7 +74,7 @@ int eThread::runAsync(int prio, int policy)
 	
 	pthread_attr_destroy(&attr);
 	return 0;
-}                     
+}
 
 int eThread::run(int prio, int policy)
 {
@@ -125,5 +128,6 @@ void eThread::kill(bool sendcancel)
 void eThread::hasStarted()
 {
 	ASSERT(!m_state.value());
+	m_started = 1;
 	m_state.up();
 }