mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Copy progress when file has alternate data streams

Browse source
This commit is contained in:
Alexander Koblov 2021-02-22 18:51:43 +00:00
commit 844cb52810
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/filesources/filesystem/ufilesystemutil.pas
View file

@ -284,17 +284,25 @@ function FileCopyProgress(TotalBytes, DoneBytes: Int64; UserData: Pointer): Long
var
Helper: TFileSystemOperationHelper absolute UserData;
begin
if (DoneBytes > 0) then
Helper.FStatistics.DoneBytes+= (DoneBytes - Helper.FStatistics.CurrentFileDoneBytes);
with Helper do
begin
FStatistics.DoneBytes+= (DoneBytes - FStatistics.CurrentFileDoneBytes);
//Helper.FStatistics.CurrentFileTotalBytes:= TotalBytes;
Helper.FStatistics.CurrentFileDoneBytes:= DoneBytes;
Helper.UpdateStatistics(Helper.FStatistics);
try
Helper.CheckOperationState;
except
on E: EFileSourceOperationAborting do
Exit(False);
// File has alternate data streams
if TotalBytes > FStatistics.CurrentFileTotalBytes then
begin
FStatistics.TotalBytes+= (TotalBytes - FStatistics.CurrentFileTotalBytes);
FStatistics.CurrentFileTotalBytes:= TotalBytes;
end;
FStatistics.CurrentFileDoneBytes:= DoneBytes;
UpdateStatistics(FStatistics);
try
CheckOperationState;
except
on E: EFileSourceOperationAborting do
Exit(False);
end;
end;
Result:= True;
end;