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: Compare files crash when second file source does not support background copy out operation (e.g. WFX FTP plugin)

Browse source
This commit is contained in:
cordylus 2018-01-04 04:28:26 +00:00
commit 23feb6539d
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ushowform.pas
View file

@ -58,7 +58,9 @@ type
TToolDataPreparedProc = procedure(const FileList: TStringList; WaitData: TWaitData);
TPrepareDataResult = (pdrFailed, pdrSynchronous, pdrAsynchronous);
// Callback may be called either asynchoronously or synchronously (for modal operations)
// pdrInCallback is returned when FunctionToCall either will be called or was already called
TPrepareDataResult = (pdrFailed, pdrSynchronous, pdrInCallback);
function PrepareData(FileSource: IFileSource; var SelectedFiles: TFiles;
FunctionToCall: TFileSourceOperationStateChangedNotify): TPrepareDataResult;
@ -681,7 +683,7 @@ begin
OperationsManager.AddOperation(Operation);
Exit(pdrAsynchronous);
Exit(pdrInCallback);
end;
Exit(pdrSynchronous);
end;
@ -817,15 +819,15 @@ begin
for I := 0 to SelectedFiles2.Count - 1 do
FFileList2.Add(SelectedFiles2[I].FullPath);
FPrepared2 := True;
TryFinish;
end;
pdrFailed:
begin
FPrepared2 := True;
FFailed := True;
TryFinish;
end;
end;
TryFinish;
end;
procedure TToolDataPreparator2.OnCopyOutStateChanged1(