fix named event (#553)

* fix named event timout and test, fix blocking queue

1 files changed, 13 insertions, 11 deletions

diff --git a/src/zencore/include/zencore/blockingqueue.h b/src/zencore/include/zencore/blockingqueue.h
index 995ba6bfb..e91fdc659 100644
--- a/src/zencore/include/zencore/blockingqueue.h
+++ b/src/zencore/include/zencore/blockingqueue.h
@@ -30,19 +30,22 @@ public:
 	bool WaitAndDequeue(T& Item)
 	{
 		std::unique_lock Lock(m_Lock);
-		if (m_Queue.empty() && !m_CompleteAdding)
+		if (m_Queue.empty())
 		{
+			if (m_CompleteAdding)
+			{
+				return false;
+			}
 			m_NewItemSignal.wait(Lock, [this]() { return !m_Queue.empty() || m_CompleteAdding; });
+			if (m_Queue.empty())
+			{
+				ZEN_ASSERT(m_CompleteAdding);
+				return false;
+			}
 		}
-
-		if (!m_Queue.empty())
-		{
-			Item = std::move(m_Queue.front());
-			m_Queue.pop_front();
-			return true;
-		}
-
-		return false;
+		Item = std::move(m_Queue.front());
+		m_Queue.pop_front();
+		return true;
 	}
 
 	void CompleteAdding()
@@ -50,7 +53,6 @@ public:
 		std::unique_lock Lock(m_Lock);
 		if (!m_CompleteAdding)
 		{
-			ZEN_ASSERT(m_Queue.empty());
 			m_CompleteAdding = true;
 
 			Lock.unlock();