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

Merge ab36504f29 into 54d6654ad1

Browse source
This commit is contained in:
EH 2026-06-19 06:48:00 +00:00 • committed by GitHub
commit 9a0d87f3a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/wcx/zip/src/fparchive/abarctyp.pas
View file

@ -1947,7 +1947,7 @@ end;
{ -------------------------------------------------------------------------- }
procedure TAbArchive.SaveIfNeeded(aItem : TAbArchiveItem);
begin
if (aItem.Action <> aaNone) then
if AutoSave and (aItem.Action <> aaNone) then
Save;
end;
{ -------------------------------------------------------------------------- }

24
plugins/wcx/zip/src/fparchive/abgztyp.pas
View file

@ -1146,9 +1146,19 @@ begin
try
{init new archive stream}
CreateArchive:= FOwnsStream and (FGzStream.Size = 0) and (FGzStream is TFileStreamEx);
if CreateArchive then
NewStream := FGzStream
{ When FTarStream is nil we have a freshly-created gzipped-tar whose
LoadArchive was never called — we cannot read back previously-saved
items. Force CreateArchive so we write directly to FGzStream
(truncated) and avoid creating a temp file we can never finish. }
CreateArchive:= FOwnsStream and (FGzStream is TFileStreamEx) and
((FGzStream.Size = 0) or (IsGzippedTar and TarAutoHandle and (FTarStream = nil)));
if CreateArchive then begin
if FGzStream.Size > 0 then begin
FGzStream.Size := 0;
FGzStream.Position := 0;
end;
NewStream := FGzStream;
end
else begin
ATempName := GetTempName(FArchiveName);
NewStream := TFileStreamEx.Create(ATempName, fmCreate or fmShareDenyWrite);
@ -1158,6 +1168,14 @@ begin
{ save the Tar data }
if IsGzippedTar and TarAutoHandle then begin
SwapToTar;
{ If FStream (=FTarStream) is nil we cannot read back items from a
previous save — this happens when SaveIfNeeded triggers a second
save on a freshly-created archive whose LoadArchive was never
called. Force those items to be re-read from disk. }
if FStream = nil then
for i := 0 to pred(Count) do
if ItemList[i].Action = aaNone then
ItemList[i].Action := aaAdd;
if FGZItem.Count = 0 then begin
CurItem := TAbGzipItem.Create;
FGZItem.Add(CurItem);