From 2ff58aa5b943839719e0ff1461d246fc3cea9c4f Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 19 Feb 2016 14:23:54 +0000 Subject: [PATCH] IDE: ReplacePackage: nil old package git-svn-id: branches/fixes_1_6@51668 - --- packager/packagesystem.pas | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas index a2a34be6f1..d565f00341 100644 --- a/packager/packagesystem.pas +++ b/packager/packagesystem.pas @@ -362,7 +362,7 @@ type // packages handling function CreateNewPackage(const Prefix: string): TLazPackage; procedure AddPackage(APackage: TLazPackage); - procedure ReplacePackage(OldPackage, NewPackage: TLazPackage); + procedure ReplacePackage(var OldPackage: TLazPackage; NewPackage: TLazPackage); procedure ClosePackage(APackage: TLazPackage); procedure CloseUnneededPackages; procedure ChangePackageID(APackage: TLazPackage; @@ -2071,7 +2071,8 @@ begin EndUpdate; end; -procedure TLazPackageGraph.ReplacePackage(OldPackage, NewPackage: TLazPackage); +procedure TLazPackageGraph.ReplacePackage(var OldPackage: TLazPackage; + NewPackage: TLazPackage); procedure MoveInstalledComponents(OldPkgFile: TPkgFile); var @@ -2118,6 +2119,7 @@ begin MoveInstalledComponents(OldPackage.RemovedFiles[i]); // delete old package Delete(fItems.IndexOf(OldPackage)); + OldPackage:=nil; // restore flags NewPackage.Installed:=OldInstalled; NewPackage.AutoInstall:=OldAutoInstall;