Index: src/libchcore/TOverlappedReader.cpp
===================================================================
diff -u -N -r6e4ac7776b68464371cd8522a2a8d79fbcab3b28 -rc4cbf6cd567821f9a981586ab5d8294a26f873be
--- src/libchcore/TOverlappedReader.cpp	(.../TOverlappedReader.cpp)	(revision 6e4ac7776b68464371cd8522a2a8d79fbcab3b28)
+++ src/libchcore/TOverlappedReader.cpp	(.../TOverlappedReader.cpp)	(revision c4cbf6cd567821f9a981586ab5d8294a26f873be)
@@ -28,7 +28,6 @@
 		unsigned long long ullFilePos, DWORD dwChunkSize) :
 		m_spLog(logger::MakeLogger(spLogFileData, L"DataBuffer")),
 		m_tEmptyBuffers(spEmptyBuffers, ullFilePos, dwChunkSize),
-		m_tFailedReadBuffers(),
 		m_spFullBuffers(std::make_shared<TOrderedBufferQueue>(ullFilePos))
 	{
 		if(!spEmptyBuffers)
@@ -63,12 +62,12 @@
 
 		LOG_TRACE(m_spLog) << L"Queuing buffer for re-read; buffer-order: " << pBuffer->GetFilePosition();
 
-		m_tFailedReadBuffers.PushWithFallback(pBuffer, m_tEmptyBuffers);
+		m_spFullBuffers->PushError(pBuffer, m_tEmptyBuffers);
 	}
 
 	TOverlappedDataBuffer* TOverlappedReader::GetFailedReadBuffer()
 	{
-		return m_tFailedReadBuffers.Pop();
+		return m_spFullBuffers->PopError();
 	}
 
 	void TOverlappedReader::AddFullBuffer(TOverlappedDataBuffer* pBuffer)
@@ -97,13 +96,12 @@
 
 	size_t TOverlappedReader::GetBufferCount() const
 	{
-		return m_tEmptyBuffers.GetCount() + m_tFailedReadBuffers.GetCount() + m_spFullBuffers->GetCount();
+		return m_tEmptyBuffers.GetCount() + m_spFullBuffers->GetCount();
 	}
 
 	void TOverlappedReader::ReleaseBuffers(const TBufferListPtr& spBuffers)
 	{
 		m_tEmptyBuffers.ReleaseBuffers(spBuffers);
-		m_tFailedReadBuffers.ReleaseBuffers(spBuffers);
 		m_spFullBuffers->ReleaseBuffers(spBuffers);
 	}
 }