Tag: hxclient_1_0_beta_2002-12-20
User: gwright 
Date: 03/01/28 14:20:58

Modified
 /common/system/platform/unix/
  UnixThreads.cpp

Log
 Merging unix threads fix to branch...
 cr ping.
 Issue number:
 Obtained from:
 Submitted by:
 Reviewed by:

File Changes:

Directory: /common/system/platform/unix/
========================================

File [changed]: UnixThreads.cpp
Url: https://common.helixcommunity.org/source/browse/common/system/platform/unix/UnixThreads.cpp.diff?r1=1.1.1.1&r2=1.1.1.1.4.1
Delta lines:  +6 -19
--------------------
--- UnixThreads.cpp	18 Oct 2002 01:45:09 -0000	1.1.1.1
+++ UnixThreads.cpp	28 Jan 2003 22:20:58 -0000	1.1.1.1.4.1
@@ -850,13 +850,12 @@
 
 HXUnixAsyncTimer::~HXUnixAsyncTimer()    
 {
-//    //Tell the message pump to quit.
-//     HXThreadMessage msgQuit(HXMSG_QUIT, NULL, NULL);
-//     m_pMessagePump->PostMessage( &msgQuit );
-
-//     //Wait for it to stop.
-//     m_pMessagePump->JoinThread();
+   //Tell the message pump to quit.
+    HXThreadMessage msgQuit(HXMSG_QUIT, NULL, NULL);
+    m_pMessagePump->PostMessage( &msgQuit );
     
+    //Wait for it to stop.
+    m_pMessagePump->JoinThread();
     HX_DELETE( m_pMessagePump );
 }
 
@@ -890,10 +889,6 @@
         else
             PARG->m_pfExecFunc( 0, 0, PARG->GetID(), GetTickCount() );
     }
-
-    HXUnixAsyncTimer* pTmp = PARG;
-    HX_DELETE(pTmp);
-    
     return NULL;
 }
 #undef PARG
@@ -975,19 +970,11 @@
     {
         //Found it.
         bRetVal = TRUE;
-	if (pTimer)
-	{
-            //Tell the message pump to quit.
-            HXThreadMessage msgQuit(HXMSG_QUIT, NULL, NULL);
-            ((HXUnixAsyncTimer*)pTimer)->m_pMessagePump->PostMessage( &msgQuit );
-    
-            //delete (HXUnixAsyncTimer*)pTimer;
-            pTimer = NULL;
-	}
         HXUnixAsyncTimer* pTmp = (HXUnixAsyncTimer*)pTimer;
         HX_DELETE(pTmp); 
         m_mapTimers.RemoveKey( ulTimerID );
     }
+
     //unlock the map.
     m_pmtxMapLock->Unlock();
 




---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe at common.helixcommunity.org
For additional commands, e-mail: cvs-help at common.helixcommunity.org