X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fthreadengine.cpp;h=268d82cc3005561f4ac57885255d0962aa9bc891;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=8e1bac4705842a9037da6d4331bdf25974cc62bd;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/threadengine.cpp b/src/threadengine.cpp
index 8e1bac470..268d82cc3 100644
--- a/src/threadengine.cpp
+++ b/src/threadengine.cpp
@@ -1,7 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008-2009 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -18,7 +22,6 @@
 
 
 #include "inspircd.h"
-#include "threadengine.h"
 
 void Thread::SetExitFlag()
 {
@@ -27,14 +30,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);
 }