Opkman: Bug fix: Install process is not aborted when the user click the "Cancel" button.

git-svn-id: trunk@57577 -
This commit is contained in:
balazs 2018-03-29 12:26:42 +00:00
parent c8b60de4c7
commit e03d7bfcb1
2 changed files with 5 additions and 2 deletions

View File

@ -273,7 +273,10 @@ begin
begin
if AResolveDependencies then
if VisualTree.ResolveDependencies = mrCancel then
begin
Result := False;
Exit;
end;
VisualTree.GetPackageList;
VisualTree.UpdatePackageStates;
end

View File

@ -1288,9 +1288,9 @@ begin
Result := MessageDlgEx(Msg, mtConfirmation, [mbYes, mbYesToAll, mbNo, mbNoToAll, mbCancel], TForm(FVST.Parent.Parent));
if Result in [mrNo, mrNoToAll] then
if MessageDlgEx(rsMainFrm_rsPackageDependency1, mtInformation, [mbYes, mbNo], TForm(FVST.Parent.Parent)) <> mrYes then
Exit;
Exit(mrCancel);
if (Result = mrNoToAll) or (Result = mrCancel) then
Exit;
Exit(mrCancel);
end;
if Result in [mrYes, mrYesToAll] then
begin