Check waitFor timeout before condition wait

uroni · Feb 24, 2016 · 5f06358 · 5f06358
1 parent 16fc18d
commit 5f06358
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ThreadPool.cpp b/ThreadPool.cpp
@@ -242,16 +242,16 @@ bool CThreadPool::waitFor(std::vector<THREADPOOL_TICKET> tickets, int timems)
 			break;
 		}
 
-		cond->wait(&lock, timems);
-
-		if(timems>=0)
+		if (timems >= 0)
 		{
 			int64 ctime = Server->getTimeMS();
-			if(ctime-starttime>timems)
+			if (ctime - starttime>=timems)
 			{
 				break;
 			}
 		}
+
+		cond->wait(&lock, timems);
 	}
 
 	for( size_t i=0;i<tickets.size();++i)