Index: src/libchcore/TSubTaskCopyMove.cpp
===================================================================
diff -u -N -r3c209ebdc14ac0829468249805b7587880761f59 -r7fd37811dbce76d429b80e4703e88925982f5859
--- src/libchcore/TSubTaskCopyMove.cpp	(.../TSubTaskCopyMove.cpp)	(revision 3c209ebdc14ac0829468249805b7587880761f59)
+++ src/libchcore/TSubTaskCopyMove.cpp	(.../TSubTaskCopyMove.cpp)	(revision 7fd37811dbce76d429b80e4703e88925982f5859)
@@ -425,12 +425,12 @@
 					eResult = tFileFBWrapper.ReadFileFB(fileSrc, *pBuffer, pData->spSrcFile->GetFullFilePath(), bSkip);
 					if(eResult != TSubTaskBase::eSubResult_Continue)
 					{
-						pBuffer->RequeueAsEmpty();
+						pData->dbBuffer.AddEmptyBuffer(pBuffer);
 						bStopProcessing = true;
 					}
 					else if(bSkip)
 					{
-						pBuffer->RequeueAsEmpty();
+						pData->dbBuffer.AddEmptyBuffer(pBuffer);
 
 						AdjustProcessedSizeForSkip(pData->spSrcFile);
 
@@ -456,12 +456,12 @@
 							eResult = tFileFBWrapper.ReadFileFB(fileSrc, *pBuffer, pData->spSrcFile->GetFullFilePath(), bSkip);
 							if(eResult != TSubTaskBase::eSubResult_Continue)
 							{
-								pBuffer->RequeueAsEmpty();
+								pData->dbBuffer.AddEmptyBuffer(pBuffer);
 								bStopProcessing = true;
 							}
 							else if(bSkip)
 							{
-								pBuffer->RequeueAsEmpty();
+								pData->dbBuffer.AddEmptyBuffer(pBuffer);
 
 								AdjustProcessedSizeForSkip(pData->spSrcFile);
 
@@ -471,12 +471,12 @@
 						}
 						else if(eResult != TSubTaskBase::eSubResult_Continue)
 						{
-							pBuffer->RequeueAsEmpty();
+							pData->dbBuffer.AddEmptyBuffer(pBuffer);
 							bStopProcessing = true;
 						}
 						else if(bSkip)
 						{
-							pBuffer->RequeueAsEmpty();
+							pData->dbBuffer.AddEmptyBuffer(pBuffer);
 
 							AdjustProcessedSizeForSkip(pData->spSrcFile);
 
@@ -491,12 +491,12 @@
 						eResult = tFileFBWrapper.WriteFileFB(fileDst, *pBuffer, pData->pathDstFile, bSkip);
 						if(eResult != TSubTaskBase::eSubResult_Continue)
 						{
-							pBuffer->RequeueAsEmpty();
+							pData->dbBuffer.AddEmptyBuffer(pBuffer);
 							bStopProcessing = true;
 						}
 						else if(bSkip)
 						{
-							pBuffer->RequeueAsEmpty();
+							pData->dbBuffer.AddEmptyBuffer(pBuffer);
 
 							AdjustProcessedSizeForSkip(pData->spSrcFile);
 
@@ -522,12 +522,12 @@
 							eResult = tFileFBWrapper.WriteFileFB(fileDst, *pBuffer, pData->pathDstFile, bSkip);
 							if(eResult != TSubTaskBase::eSubResult_Continue)
 							{
-								pBuffer->RequeueAsEmpty();
+								pData->dbBuffer.AddEmptyBuffer(pBuffer);
 								bStopProcessing = true;
 							}
 							else if(bSkip)
 							{
-								pBuffer->RequeueAsEmpty();
+								pData->dbBuffer.AddEmptyBuffer(pBuffer);
 
 								AdjustProcessedSizeForSkip(pData->spSrcFile);
 
@@ -537,12 +537,12 @@
 						}
 						else if(eResult != TSubTaskBase::eSubResult_Continue)
 						{
-							pBuffer->RequeueAsEmpty();
+							pData->dbBuffer.AddEmptyBuffer(pBuffer);
 							bStopProcessing = true;
 						}
 						else if(bSkip)
 						{
-							pBuffer->RequeueAsEmpty();
+							pData->dbBuffer.AddEmptyBuffer(pBuffer);
 
 							AdjustProcessedSizeForSkip(pData->spSrcFile);
 
@@ -555,12 +555,12 @@
 						eResult = tFileFBWrapper.FinalizeFileFB(fileDst, *pBuffer, pData->pathDstFile, bSkip);
 						if (eResult != TSubTaskBase::eSubResult_Continue)
 						{
-							pBuffer->RequeueAsEmpty();
+							pData->dbBuffer.AddEmptyBuffer(pBuffer);
 							bStopProcessing = true;
 						}
 						else if (bSkip)
 						{
-							pBuffer->RequeueAsEmpty();
+							pData->dbBuffer.AddEmptyBuffer(pBuffer);
 
 							AdjustProcessedSizeForSkip(pData->spSrcFile);
 
@@ -578,7 +578,7 @@
 							bStopProcessing = pBuffer->IsLastPart();
 
 							pData->dbBuffer.MarkFinishedBufferAsComplete(pBuffer);
-							pBuffer->RequeueAsEmpty();
+							pData->dbBuffer.AddEmptyBuffer(pBuffer);
 
 							if(bStopProcessing)
 							{