From 6ddab55a35bec642ae8a446e9f50db4ef24d6e91 Mon Sep 17 00:00:00 2001 From: ondrej Date: Sun, 3 Jan 2016 15:51:24 +0000 Subject: [PATCH] packagetabs: fix TRecreateToolBarStamps.Changed git-svn-id: trunk@51165 - --- components/packagetabs/packagetabs_impl.pas | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/components/packagetabs/packagetabs_impl.pas b/components/packagetabs/packagetabs_impl.pas index aa3d7272e0..63dd9202a3 100644 --- a/components/packagetabs/packagetabs_impl.pas +++ b/components/packagetabs/packagetabs_impl.pas @@ -375,20 +375,22 @@ begin end; function TRecreateToolBarStamps.Changed: Boolean; +var + LProjectChangeStamp: Integer; begin + if LazarusIDE.ActiveProject <> nil then + LProjectChangeStamp := LazarusIDE.ActiveProject.ChangeStamp + else + LProjectChangeStamp := Low(LProjectChangeStamp); Result := not( - (LazarusIDE.ActiveProject <> nil) - and (FCurProjectChangeStamp = LazarusIDE.ActiveProject.ChangeStamp) + (FCurProjectChangeStamp = LProjectChangeStamp) and (FPackagesChangeStamp = PackageGraphInterface.ChangeStamp) and (FInternalChangeStamp = FLastInternalChangeStamp) ); if not Result then Exit; - if LazarusIDE.ActiveProject <> nil then - FCurProjectChangeStamp := LazarusIDE.ActiveProject.ChangeStamp - else - FCurProjectChangeStamp := Low(FCurProjectChangeStamp); + FCurProjectChangeStamp := LProjectChangeStamp; FPackagesChangeStamp := PackageGraphInterface.ChangeStamp; FLastInternalChangeStamp := FInternalChangeStamp; end;