Merged revision(s) 51896 #1343b1dd2f from trunk:

Packager: Fix a crash when adding a package dependency which already is there. Issue #29680.
........

git-svn-id: branches/fixes_1_6@51992 -
This commit is contained in:
maxim 2016-03-19 13:17:16 +00:00
parent ee9fabad52
commit 23ff3cc22b

View File

@ -927,13 +927,12 @@ begin
end; end;
NewDependency.PackageName:=DependPkgNameComboBox.Text; NewDependency.PackageName:=DependPkgNameComboBox.Text;
if CheckAddingDependency(LazPackage,NewDependency,false,true)<>mrOk then exit; ModalResult:=CheckAddingDependency(LazPackage,NewDependency,false,true);
if ModalResult<>mrOk then exit;
// ok // ok
Params.Dependency:=NewDependency; Params.Dependency:=NewDependency;
NewDependency:=nil; NewDependency:=nil;
ModalResult:=mrOk;
finally finally
NewDependency.Free; NewDependency.Free;
end; end;