Browse Source

Fixed issue with auto send to friends, after 30 seconds the first send would not be sent

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@822 595ec19a-5cb4-439b-94a8-42fb3063c22c
sabrogden 9 years ago
parent
commit
ffdd5caa3b
5 changed files with 12 additions and 6 deletions
  1. 1 0
      AutoSendToClientThread.cpp
  2. 8 6
      EventThread.cpp
  3. 1 0
      EventThread.h
  4. 1 0
      MainFrmThread.cpp
  5. 1 0
      QPasteWndThread.cpp

+ 1 - 0
AutoSendToClientThread.cpp

@@ -8,6 +8,7 @@
 CAutoSendToClientThread::CAutoSendToClientThread(void)
 {
 	m_waitTimeout = 30000;
+	m_threadName = "CAutoSendToClientThread";
 	for(int eventEnum = 0; eventEnum < ECAUTOSENDTOCLIENTTHREADEVENTS_COUNT; eventEnum++)
 	{
 		AddEvent(eventEnum);

+ 8 - 6
EventThread.cpp

@@ -116,7 +116,7 @@ void CEventThread::WaitForThreadToExit(int waitTime)
 
 void CEventThread::Stop(int waitTime) 
 {
-	Log(_T("Start of CEventThread::Stop(int waitTime) "));
+	Log(StrF(_T("Start of CEventThread::Stop(int waitTime) %d - Name: %s"), waitTime, m_threadName));
 
 	if(m_threadRunning)
 	{
@@ -135,12 +135,12 @@ void CEventThread::Stop(int waitTime)
 		}
 	}
 
-	Log(_T("End of CEventThread::Stop(int waitTime) "));
+	Log(StrF(_T("End of CEventThread::Stop(int waitTime) %d - Name: %s"), waitTime, m_threadName));
 };
 
 void CEventThread::RunThread()
 {
-	Log(_T("Start of CEventThread::RunThread()"));
+	Log(StrF(_T("Start of CEventThread::RunThread() Name: %s"), m_threadName));
 
 	m_threadRunning = true;
 	m_threadWasStarted = true;
@@ -191,16 +191,18 @@ void CEventThread::RunThread()
 			}
 			else
 			{
-				Log(StrF(_T("Start of CEventThread::RunThread() - OnEvent %d"), eventId));
+				Log(StrF(_T("Start of CEventThread::RunThread() - OnEvent %d - Name %s"), eventId, m_threadName));
 				OnEvent(eventId, m_param);
-				Log(StrF(_T("End of CEventThread::RunThread() - OnEvent %d"), eventId));
+				Log(StrF(_T("End of CEventThread::RunThread() - OnEvent %d - Name: %d"), eventId, m_threadName));
 			}
 		}
 	}
 
+	UndoFireEvent(EXIT_EVENT);
+
 	SetEvent(m_hEvt);
 
-	Log(_T("End of CEventThread::RunThread()"));
+	Log(StrF(_T("End of CEventThread::RunThread() Name: %s"), m_threadName));
 
 	m_threadRunning = false;
 }

+ 1 - 0
EventThread.h

@@ -28,6 +28,7 @@ protected:
 	bool m_threadWasStarted;
 	void *m_param;
 	int m_waitTimeout;
+	CString m_threadName;
 
 public:
 	void Start(void *param = NULL);

+ 1 - 0
MainFrmThread.cpp

@@ -7,6 +7,7 @@
 
 CMainFrmThread::CMainFrmThread(void)
 {
+	m_threadName = "CMainFrmThread";
     for(int eventEnum = 0; eventEnum < ECMAINFRMTHREADEVENTS_COUNT; eventEnum++)
     {
         AddEvent(eventEnum);

+ 1 - 0
QPasteWndThread.cpp

@@ -7,6 +7,7 @@
 
 CQPasteWndThread::CQPasteWndThread(void)
 {
+	m_threadName = "CQPasteWndThread";
     m_waitTimeout = ONE_HOUR * 12;
 
     m_SearchingEvent = CreateEvent(NULL, TRUE, FALSE, _T(""));