--- innwebd/base.h 2004/07/03 13:56:04 1.2 +++ innwebd/base.h 2004/07/04 22:49:03 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 */ @@ -28,7 +28,7 @@ public: int end(void); inline bool IsRunning(void) { - return this->running; + return (this->running && this->IsThreadActive()); } inline base* GetParentThread(void) { @@ -47,6 +47,7 @@ public: this->p_ThreadPool = p_ThreadPool; } protected: + ULONG ulMainThreadId; base* p_ParentThread; thread_pool* p_ThreadPool; SOCKET s; @@ -79,7 +80,8 @@ protected: virtual int Startup(void); virtual int w_call() = 0; private: - HANDLE hThread; static DWORD Thread(LPVOID pParam); +public: + bool IsThreadActive(void); };