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: Also fixes for bug [0000225]

Browse source
This commit is contained in:
Alexander Koblov 2011-12-03 10:44:12 +00:00
commit dfd7d6995f
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/newdesign/uwfxpluginutil.pas
View file

@ -124,7 +124,7 @@ begin
end
else
begin
if AskQuestion(sMessage, '', [fsourSkip, fsourCancel],
if AskQuestion(sMessage, '', [fsourSkip, fsourAbort],
fsourSkip, fsourAbort) = fsourAbort then
begin
AbortOperation;

13
src/umaincommands.pas
View file

@ -1010,6 +1010,7 @@ var
TempFileSource: ITempFileSystemFileSource = nil;
Operation: TFileSourceOperation;
aFileSource: IFileSource;
UI: TFileSourceOperationMessageBoxesUI = nil;
begin
with frmMain do
try
@ -1062,8 +1063,16 @@ begin
if Assigned(Operation) then
begin
Operation.Execute;
FreeAndNil(Operation);
// Call directly - not through operations manager.
UI := TFileSourceOperationMessageBoxesUI.Create;
try
Operation.AddUserInterface(UI);
Operation.Execute;
if Operation.Result = fsorAborted then Exit;
finally
FreeAndNil(Operation);
FreeAndNil(UI);
end;
aFileSource := TempFileSource;
ChangeFileListRoot(TempFileSource.FileSystemRoot, SelectedFiles);