From 9c700c5876acb50bbaf910049f6a9535bb6327f4 Mon Sep 17 00:00:00 2001
From: pescuma <pescuma@c086bb3d-8645-0410-b8da-73a8550f86e7>
Date: Tue, 20 May 2008 23:53:15 +0000
Subject: Added some new methods to Buffer and ContactAsyncQueue

git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@107 c086bb3d-8645-0410-b8da-73a8550f86e7
---
 Plugins/utils/ContactAsyncQueue.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'Plugins/utils/ContactAsyncQueue.cpp')

diff --git a/Plugins/utils/ContactAsyncQueue.cpp b/Plugins/utils/ContactAsyncQueue.cpp
index 7be4cfe..ca6bf83 100644
--- a/Plugins/utils/ContactAsyncQueue.cpp
+++ b/Plugins/utils/ContactAsyncQueue.cpp
@@ -48,12 +48,11 @@ ContactAsyncQueue::ContactAsyncQueue(pfContactAsyncQueueCallback fContactAsyncQu
 
 ContactAsyncQueue::~ContactAsyncQueue()
 {
-	if (finished == 0)
-		finished = 1;
-	SetEvent(hEvent);
+	Finish();
+
 	int count = 0;
 	while(finished != 2 && ++count < 50)
-		Sleep(10);
+		Sleep(30);
 
 	for (int i = 0; i < queue.getCount(); i++)
 		if (queue[i] != NULL)
@@ -62,6 +61,13 @@ ContactAsyncQueue::~ContactAsyncQueue()
 	DeleteCriticalSection(&cs);
 }
 
+void ContactAsyncQueue::Finish()
+{
+	if (finished == 0)
+		finished = 1;
+	SetEvent(hEvent);
+}
+
 void ContactAsyncQueue::Lock()
 {
 	EnterCriticalSection(&cs);
@@ -170,6 +176,9 @@ void ContactAsyncQueue::Thread()
 	{
 		ResetEvent(hEvent);
 
+		if (finished)
+			break;
+
 		Lock();
 
 		if (queue.getCount() <= 0)
-- 
cgit v1.2.3