mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Bug [0002560]

Browse source
This commit is contained in:
Alexander Koblov 2020-11-27 18:56:45 +00:00
commit a7c36383ee
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/fpackdlg.pas
View file

@ -93,7 +93,7 @@ uses
StrUtils, WcxPlugin, uGlobs, uDCUtils, uFileSourceOperation, uLng, uOSUtils,
uOperationsManager, uArchiveFileSourceUtil, uMultiArchiveFileSource,
uWcxArchiveCopyInOperation, uMultiArchiveCopyInOperation, uMasks,
DCStrUtils, uMultiArc;
DCStrUtils, uMultiArc, uWcxModule;
function ShowPackDlg(TheOwner: TComponent;
const SourceFileSource: IFileSource;
@ -265,10 +265,15 @@ begin
FreeAndNil(aFile);
end;
except
on E: EFileSourceException do
on E: Exception do
begin
MessageDlg(E.Message, mtError, [mbOK], 0);
Exit;
if (E is EFileSourceException) or (E is EWcxModuleException) then
begin
if MessageDlg(E.Message, mtError, [mbIgnore, mbAbort], 0) = mrIgnore then
Continue;
Exit;
end;
raise;
end;
end;
// Pack current item
@ -291,10 +296,14 @@ begin
FreeAndNil(aFile);
end;
except
on E: EFileSourceException do
on E: Exception do
begin
MessageDlg(E.Message, mtError, [mbOK], 0);
Exit;
if (E is EFileSourceException) or (E is EWcxModuleException) then
begin
MessageDlg(E.Message, mtError, [mbOK], 0);
Exit;
end;
raise;
end;
end;
// Pack files