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: Multiarc copy Copying dialog shows incorrect speed and time remaining on the first copy start (fixes #1609)

Browse source
This commit is contained in:
Alexander Koblov 2024-05-04 12:48:30 +03:00
commit a19d3c3ad5
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/fFileOpDlg.pas
View file

@ -810,7 +810,9 @@ begin
sEstimated := #32
else
begin
if RemainingTime > 0 then
if RemainingTime < 0 then
sEstimated := #32
else if RemainingTime > 0 then
begin
// Normal view, less than 24 hours of estimated time
if RemainingTime < 1.0 then

7
src/filesources/multiarchive/umultiarchivecopyoutoperation.pas
View file

@ -118,7 +118,9 @@ begin
FStatistics := RetrieveStatistics;
with FStatistics do
begin
DoneBytes := -1;
DoneFiles := -1;
RemainingTime := -1;
CurrentFileDoneBytes := -1;
UpdateStatistics(FStatistics);
end;
@ -215,6 +217,9 @@ begin
// Get maximum acceptable command errorlevel
FErrorLevel:= ExtractErrorLevel(sCommandLine);
if Pos('%F', sCommandLine) <> 0 then // extract file by file
begin
FStatistics.DoneBytes:= 0;
for I:= 0 to FFullFilesTreeToExtract.Count - 1 do
begin
CheckOperationState;
@ -259,6 +264,7 @@ begin
CheckForErrors(aFile.FullPath, TargetFileName, FExProcess.ExitStatus);
end;
end // for
end
else // extract whole file list
begin
sTempDir:= TargetPath; // directory where files will be unpacked
@ -295,7 +301,6 @@ begin
FStatistics.CurrentFileFrom:= SourceFiles.Path;
FStatistics.CurrentFileTo:= TargetPath;
end;
FStatistics.DoneBytes:= -1;
UpdateStatistics(FStatistics);
end;