|
@@ -1947,7 +1947,7 @@ var
|
|
begin
|
|
begin
|
|
{ See above }
|
|
{ See above }
|
|
|
|
|
|
- Result := NewFileExistsRedir(DisableFsRedir, ArchiveFilename);
|
|
|
|
|
|
+ Result := True; { We handle errors ourselves }
|
|
|
|
|
|
if foCustomDestName in CurFile^.Options then
|
|
if foCustomDestName in CurFile^.Options then
|
|
InternalError('Unexpected custom DestName');
|
|
InternalError('Unexpected custom DestName');
|
|
@@ -1983,6 +1983,7 @@ var
|
|
Failed := GetExceptMessage;
|
|
Failed := GetExceptMessage;
|
|
end;
|
|
end;
|
|
until (Failed = '') or
|
|
until (Failed = '') or
|
|
|
|
+ (foSkipIfSourceDoesntExist in CurFile^.Options) or
|
|
AbortRetryIgnoreTaskDialogMsgBox(
|
|
AbortRetryIgnoreTaskDialogMsgBox(
|
|
ArchiveFilename + SNewLine2 + SetupMessages[msgErrorExtracting] + SNewLine + Failed,
|
|
ArchiveFilename + SNewLine2 + SetupMessages[msgErrorExtracting] + SNewLine + Failed,
|
|
[SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgFileAbortRetryIgnoreSkipNotRecommended], SetupMessages[msgAbortRetryIgnoreCancel]]);
|
|
[SetupMessages[msgAbortRetryIgnoreRetry], SetupMessages[msgFileAbortRetryIgnoreSkipNotRecommended], SetupMessages[msgAbortRetryIgnoreCancel]]);
|