X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fthread.cpp;h=0fc86cf07c7cf18b23289438b9ecb84c5847dd2d;hb=47a232c3c19e718a30281d3ada8acc1b6212ea8c;hp=6858ce9999b8ba2211db353802acfa2750811125;hpb=e1ea831a640fba534e7e42e399f04cdf681ef8d3;p=libs%2Fcore.git

diff --git a/source/core/thread.cpp b/source/core/thread.cpp
index 6858ce9..0fc86cf 100644
--- a/source/core/thread.cpp
+++ b/source/core/thread.cpp
@@ -1,8 +1,10 @@
-/*
-This file is part of libmspframework
+/* $Id$
+
+This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #ifndef WIN32
 #include <signal.h>
 #endif
@@ -52,7 +54,10 @@ void Thread::kill()
 Thread::~Thread()
 {
 	if(launched_)
+	{
 		kill();
+		join();
+	}
 }
 
 void Thread::launch()