--- innwebd/base.cpp	2004/07/03 15:10:23	1.3
+++ innwebd/base.cpp	2004/07/04 06:45:23	1.4
@@ -1,10 +1,10 @@
 /*******************************************************/
 /*                                                     */
-/*  LeafOK Innd                                        */
+/*  LeafOK Innbbsd                                     */
 /*  Copyright (C) LeafOK.com, 2003-2004                */
 /*                                                     */
 /*  Programmed by Leaf                                 */
-/*  E-mail:leaf@leafok.com  QQ:6049044                 */
+/*  E-mail:leaflet@leafok.com  QQ:6049044              */
 /*                                                     */
 /*  http://bbs.leafok.com                              */
 /*  http://bbs.leafok.net                              */
@@ -22,6 +22,8 @@ using namespace std;
 
 base::base(void)
 : p_ParentThread(NULL)
+, p_ThreadPool(NULL)
+, ulMainThreadId(0)
 , innd_uid(0)
 , isConnected(false)
 , running(false)
@@ -30,6 +32,8 @@ base::base(void)
 
 base::~base(void)
 {
+	if (this->GetThreadPool() != NULL)
+		delete (this->GetThreadPool());
 }
 
 int base::s_exec(const char* in_str, CString& out_str, const char* end_str)
@@ -489,23 +493,23 @@ int base::begin(void)
 
 DWORD base::Thread(LPVOID pParam)
 {
-	HANDLE hThreadCurrent;
 	base* p;
 
 	syslog << logfile::log_head << "Thread started." << endl;
 
 	p = (base*)pParam;
-	hThreadCurrent = GetCurrentThread();
 
-	if (p->GetParentThread()->GetThreadPool()->AddThread(hThreadCurrent, CLOCKS_PER_SEC * 30) != 0)
+	p->ulMainThreadId = GetCurrentThreadId();
+
+	if (p->GetParentThread()->GetThreadPool()->AddThread(GetCurrentThreadId(), CLOCKS_PER_SEC * 30) != 0)
 	{
 		syslog << logfile::log_head << "Register thread ... Failed" << endl;
 	}
-	p->GetParentThread()->GetThreadPool()->SetThreadStatus(hThreadCurrent,thread_pool::S_WORKING);
+	p->GetParentThread()->GetThreadPool()->SetThreadStatus(GetCurrentThreadId(),thread_pool::S_WORKING);
 
 	p->w_call();
 
-	if (p->GetParentThread()->GetThreadPool()->RemoveThread(hThreadCurrent) != 0)
+	if (p->GetParentThread()->GetThreadPool()->RemoveThread(GetCurrentThreadId()) != 0)
 	{
 		syslog << logfile::log_head << "Unregister thread ... Failed" << endl;
 	}
@@ -549,3 +553,20 @@ int base::Startup(void)
 {
 	return 0;
 }
+
+bool base::IsThreadActive(void)
+{
+	bool bIsActive = false;
+
+	switch (this->GetParentThread()->GetThreadPool()->GetThreadStatus(this->ulMainThreadId))
+	{
+	case thread_pool::S_WAITING:
+	case thread_pool::S_WORKING:
+		bIsActive = true;
+		break;
+	default:
+		bIsActive = false;
+	}
+
+	return bIsActive;
+}