2 files changed, 27 insertions, 11 deletions
diff --git a/include/threadengine.h b/include/threadengine.h
index 7d27b867a..0f729a962 100644
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -21,14 +21,8 @@
 #include "base.h"
 
 class InspIRCd;
+class Thread;
 
-class CoreExport Thread : public Extensible
-{
- public:
-	Thread() { };
-	virtual ~Thread() { };
-	virtual void Run() = 0;
-};
 
 class CoreExport ThreadEngine : public Extensible
 {
@@ -48,6 +42,30 @@ class CoreExport ThreadEngine : public Extensible
 	virtual void Run() = 0;
 
 	virtual void Create(Thread* thread_to_init) = 0;
+
+	virtual void FreeThread(Thread* thread) = 0;
 };
 
+class CoreExport Thread : public Extensible
+{
+ public:
+
+	ThreadEngine* Creator;
+
+	Thread() : Creator(NULL)
+	{
+	}
+
+	virtual ~Thread()
+	{
+		if (Creator)
+			Creator->FreeThread(this);
+	}
+
+	virtual void Run() = 0;
+};
+
+
+
 #endif
+
diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h
index db32acbcc..2c821d93d 100644
--- a/include/threadengines/threadengine_pthread.h
+++ b/include/threadengines/threadengine_pthread.h
@@ -23,10 +23,6 @@ class InspIRCd;
 
 class CoreExport PThreadEngine : public ThreadEngine
 {
- private:
-
-	 pthread_t MyPThread;
-
  public:
 
 	PThreadEngine(InspIRCd* Instance);
@@ -40,6 +36,8 @@ class CoreExport PThreadEngine : public ThreadEngine
 	static void* Entry(void* parameter);
 
 	void Create(Thread* thread_to_init);
+
+	void FreeThread(Thread* thread);
 };
 
 #endif