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: Cancel queue when closing progress window.

Browse source
This commit is contained in:
cobines 2012-03-28 09:03:58 +00:00
commit 9024ae2eb7
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/fFileOpDlg.pas
View file

@ -98,6 +98,7 @@ type
procedure UpdatePauseStartButton(OpManItem: TOperationsManagerItem);
procedure SetProgressBytes(ProgressBar: TKASProgressBar; CurrentBytes: Int64; TotalBytes: Int64);
procedure SetSpeedAndTime(Operation: TFileSourceOperation; RemainingTime: TDateTime; Speed: String);
procedure StopOperationOrQueue;
procedure InitializeCopyOperation(OpManItem: TOperationsManagerItem);
procedure InitializeMoveOperation(OpManItem: TOperationsManagerItem);
@ -206,18 +207,9 @@ begin
end;
procedure TfrmFileOp.btnCancelClick(Sender: TObject);
var
OpManItem: TOperationsManagerItem;
begin
OpManItem := OperationsManager.GetItemByHandle(FOperationHandle);
if Assigned(OpManItem) then
begin
if OpManItem.Queue.IsFree then
OpManItem.Operation.Stop
else
OpManItem.Queue.Stop;
ModalResult:= mrCancel;
end;
StopOperationOrQueue;
ModalResult:= mrCancel;
end;
procedure TfrmFileOp.btnMinimizeToPanelClick(Sender: TObject);
@ -374,17 +366,11 @@ begin
end;
function TfrmFileOp.CloseQuery: Boolean;
var
OpManItem: TOperationsManagerItem;
begin
Result := True;
if FStopOperationOnClose then
begin
OpManItem := OperationsManager.GetItemByHandle(FOperationHandle);
if Assigned(OpManItem) then
OpManItem.Operation.Stop;
end;
StopOperationOrQueue;
end;
class procedure TfrmFileOp.AddEventsListener(Events: TOperationProgressWindowEvents; FunctionToCall: TOperationProgressWindowEventProc);
@ -512,6 +498,20 @@ begin
end;
end;
procedure TfrmFileOp.StopOperationOrQueue;
var
OpManItem: TOperationsManagerItem;
begin
OpManItem := OperationsManager.GetItemByHandle(FOperationHandle);
if Assigned(OpManItem) then
begin
if OpManItem.Queue.IsFree then
OpManItem.Operation.Stop
else
OpManItem.Queue.Stop;
end;
end;
procedure TfrmFileOp.OnUpdateTimer(Sender: TObject);
var
OpManItem: TOperationsManagerItem;