Index: src/libchcore/TSubTaskFastMove.cpp =================================================================== diff -u -N -r8a2ff3b2b71b45fb525e030167e62f316cb32869 -rc0d9a798f9fbbeda239b84721ed864f9727e1ddc --- src/libchcore/TSubTaskFastMove.cpp (.../TSubTaskFastMove.cpp) (revision 8a2ff3b2b71b45fb525e030167e62f316cb32869) +++ src/libchcore/TSubTaskFastMove.cpp (.../TSubTaskFastMove.cpp) (revision c0d9a798f9fbbeda239b84721ed864f9727e1ddc) @@ -143,15 +143,14 @@ TFileInfoPtr spFileInfo(std::make_shared()); - bool bSkip = false; - ESubOperationResult eResult = tFilesystemFBWrapper.GetFileInfoFB(pathCurrent, spFileInfo, spBasePath, bSkip); - if (eResult != TSubTaskBase::eSubResult_Continue) - return eResult; - else if (bSkip) + ESubOperationResult eResult = tFilesystemFBWrapper.GetFileInfoFB(pathCurrent, spFileInfo, spBasePath); + if (eResult == TSubTaskBase::eSubResult_SkipFile) { spBasePath->SetSkipFurtherProcessing(true); continue; } + else if (eResult != TSubTaskBase::eSubResult_Continue) + return eResult; // does it match the input filter? if (!spFileInfo->IsDirectory() && !rafFilters.Match(spFileInfo)) @@ -161,11 +160,9 @@ } // try to fast move - eResult = tFilesystemFBWrapper.FastMoveFB(spFileInfo, tDstPathProvider.CalculateDestinationPath(spFileInfo), spBasePath, bSkip); + eResult = tFilesystemFBWrapper.FastMoveFB(spFileInfo, tDstPathProvider.CalculateDestinationPath(spFileInfo), spBasePath); if (eResult != TSubTaskBase::eSubResult_Continue) return eResult; - //else if (bSkip) - // continue; // check for kill need if (rThreadController.KillRequested())