From 54b0d3d0d41be3d93e922f58a0813c28b8d995a2 Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Fri, 8 Jan 2016 12:02:03 +0000
Subject: [PATCH] merge r51143 #3fb93ad0bf,r51159,r51165: packagetabs:
 packagetabs: prevent AV packagetabs: prevent AV packagetabs: fix
 TRecreateToolBarStamps.Changed

git-svn-id: branches/fixes_1_6@51228 -
---
 components/packagetabs/packagetabs_impl.pas | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/components/packagetabs/packagetabs_impl.pas b/components/packagetabs/packagetabs_impl.pas
index f6495f20d5..63dd9202a3 100644
--- a/components/packagetabs/packagetabs_impl.pas
+++ b/components/packagetabs/packagetabs_impl.pas
@@ -375,17 +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;
 
-  FCurProjectChangeStamp := LazarusIDE.ActiveProject.ChangeStamp;
+  FCurProjectChangeStamp := LProjectChangeStamp;
   FPackagesChangeStamp := PackageGraphInterface.ChangeStamp;
   FLastInternalChangeStamp := FInternalChangeStamp;
 end;
@@ -786,6 +791,7 @@ var
   xGroupTitle: string;
   xGroupType: TGroupType;
 begin
+  xActBtn := nil;
   FRecreateToolBar.FLastFiles.Clear;
   FWindow.IncUpdateLock;
   FWindow.DisableAlign;