Index: src/libchcore/TOverlappedDataBufferQueue.cpp
===================================================================
diff -u -N -r862ded8b585e1eade1ff54fd86c1ed06ddeda41f -r9312d2ac24e7963495b234adb8b9628076b16023
--- src/libchcore/TOverlappedDataBufferQueue.cpp	(.../TOverlappedDataBufferQueue.cpp)	(revision 862ded8b585e1eade1ff54fd86c1ed06ddeda41f)
+++ src/libchcore/TOverlappedDataBufferQueue.cpp	(.../TOverlappedDataBufferQueue.cpp)	(revision 9312d2ac24e7963495b234adb8b9628076b16023)
@@ -68,9 +68,9 @@
 		m_listEmptyBuffers.pop_front();
 
 		pBuffer->SetBufferOrder(m_ullNextReadBufferOrder++);
-		if(m_listEmptyBuffers.empty())
-			m_eventReadPossible.ResetEvent();
 
+		UpdateReadPossibleEvent();
+
 		return pBuffer;
 	}
 
@@ -83,7 +83,12 @@
 		THROW_CORE_EXCEPTION(eErr_InvalidPointer);
 
 	m_listEmptyBuffers.push_back(pBuffer);
-	if (!m_bDataSourceFinished)
+	UpdateReadPossibleEvent();
+}
+
+void TOverlappedDataBufferQueue::UpdateReadPossibleEvent()
+{
+	if (!m_listEmptyBuffers.empty() && !m_bDataSourceFinished)
 		m_eventReadPossible.SetEvent();
 	else
 		m_eventReadPossible.ResetEvent();
@@ -100,11 +105,10 @@
 		m_setFullBuffers.erase(m_setFullBuffers.begin());
 		m_ullNextExpectedWritePosition += pBuffer->GetBytesTransferred();
 
-		if(m_setFullBuffers.empty())
-			m_eventWritePossible.ResetEvent();
-
 		++m_ullNextWriteBufferOrder;
 
+		UpdateWritePossibleEvent();
+
 		return pBuffer;
 	}
 
@@ -130,12 +134,21 @@
 	if(pBuffer->IsLastPart())
 		m_bDataSourceFinished = true;
 
-	TOverlappedDataBuffer* pFirstBuffer = *m_setFullBuffers.begin();
+	UpdateWritePossibleEvent();
+}
 
-	if(pFirstBuffer->GetBufferOrder() == m_ullNextWriteBufferOrder)
-		m_eventWritePossible.SetEvent();
-	else
+void TOverlappedDataBufferQueue::UpdateWritePossibleEvent()
+{
+	if (m_setFullBuffers.empty())
 		m_eventWritePossible.ResetEvent();
+	else
+	{
+		TOverlappedDataBuffer* pFirstBuffer = *m_setFullBuffers.begin();
+		if (pFirstBuffer->GetBufferOrder() == m_ullNextWriteBufferOrder)
+			m_eventWritePossible.SetEvent();
+		else
+			m_eventWritePossible.ResetEvent();
+	}
 }
 
 TOverlappedDataBuffer* TOverlappedDataBufferQueue::GetFinishedBuffer()
@@ -148,11 +161,10 @@
 
 		m_setFinishedBuffers.erase(m_setFinishedBuffers.begin());
 
-		if(m_setFinishedBuffers.empty())
-			m_eventWriteFinished.ResetEvent();
-
 		++m_ullNextFinishedBufferOrder;
 
+		UpdateWriteFinishedEvent();
+
 		return pBuffer;
 	}
 
@@ -166,12 +178,21 @@
 
 	m_setFinishedBuffers.insert(pBuffer);
 
-	TOverlappedDataBuffer* pFirstBuffer = *m_setFinishedBuffers.begin();
+	UpdateWriteFinishedEvent();
+}
 
-	if(pFirstBuffer->GetBufferOrder() == m_ullNextFinishedBufferOrder)
-		m_eventWriteFinished.SetEvent();
-	else
+void TOverlappedDataBufferQueue::UpdateWriteFinishedEvent()
+{
+	if (m_setFinishedBuffers.empty())
 		m_eventWriteFinished.ResetEvent();
+	else
+	{
+		TOverlappedDataBuffer* pFirstBuffer = *m_setFinishedBuffers.begin();
+		if (pFirstBuffer->GetBufferOrder() == m_ullNextFinishedBufferOrder)
+			m_eventWriteFinished.SetEvent();
+		else
+			m_eventWriteFinished.ResetEvent();
+	}
 }
 
 void TOverlappedDataBufferQueue::ReinitializeBuffers(size_t stCount, size_t stBufferSize)
Index: src/libchcore/TOverlappedDataBufferQueue.h
===================================================================
diff -u -N -r862ded8b585e1eade1ff54fd86c1ed06ddeda41f -r9312d2ac24e7963495b234adb8b9628076b16023
--- src/libchcore/TOverlappedDataBufferQueue.h	(.../TOverlappedDataBufferQueue.h)	(revision 862ded8b585e1eade1ff54fd86c1ed06ddeda41f)
+++ src/libchcore/TOverlappedDataBufferQueue.h	(.../TOverlappedDataBufferQueue.h)	(revision 9312d2ac24e7963495b234adb8b9628076b16023)
@@ -62,6 +62,9 @@
 
 private:
 	void CleanupBuffers();
+	void UpdateReadPossibleEvent();
+	void UpdateWritePossibleEvent();
+	void UpdateWriteFinishedEvent();
 
 private:
 	std::deque<std::unique_ptr<TOverlappedDataBuffer>> m_listAllBuffers;