Merge pull request #976 from SaberUK/master+fix-xline-db

[user/henk/code/inspircd.git] / src / threadengine.cpp

diff --git a/src/threadengine.cpp b/src/threadengine.cpp
index 8f1895c0fb74619bb94c1efeab430f2b846c6208..f757aa56c7d1509f332306b7d2bace777c9912e0 100644 (file)
--- a/src/threadengine.cpp
+++ b/src/threadengine.cpp
@@ -17,14 +17,7 @@
  */
 
 
-/* $Core */
-
-/*********        DEFAULTS       **********/
-/* $ExtraSources: threadengines/threadengine_pthread.cpp */
-/* $ExtraObjects: threadengine_pthread.o */
-
 #include "inspircd.h"
-#include "threadengine.h"
 
 void Thread::SetExitFlag()
 {
@@ -33,14 +26,5 @@ void Thread::SetExitFlag()
 
 void Thread::join()
 {
-               state->FreeThread(this);
-               delete state;
-               state = 0;
-}
-
-/** If this thread has a Creator set, call it to
- * free the thread
- */
-Thread::~Thread()
-{
+       ServerInstance->Threads.Stop(this);
 }