paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-13 09:29:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r51143 #3fb93ad0bf,r51159,r51165: packagetabs:

Browse Source 
packagetabs: prevent AV
packagetabs: prevent AV
packagetabs: fix TRecreateToolBarStamps.Changed

git-svn-id: branches/fixes_1_6@51228 -
This commit is contained in:
ondrej 2016-01-08 12:02:03 +00:00
parent aef0c57b99
commit 54b0d3d0d4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/packagetabs/packagetabs_impl.pas
View File

@ -375,17 +375,22 @@ begin
end; end;
function TRecreateToolBarStamps.Changed: Boolean; function TRecreateToolBarStamps.Changed: Boolean;
var
LProjectChangeStamp: Integer;
begin begin
if LazarusIDE.ActiveProject <> nil then
LProjectChangeStamp := LazarusIDE.ActiveProject.ChangeStamp
else
LProjectChangeStamp := Low(LProjectChangeStamp);
Result := not( Result := not(
(LazarusIDE.ActiveProject <> nil) (FCurProjectChangeStamp = LProjectChangeStamp)
and (FCurProjectChangeStamp = LazarusIDE.ActiveProject.ChangeStamp)
and (FPackagesChangeStamp = PackageGraphInterface.ChangeStamp) and (FPackagesChangeStamp = PackageGraphInterface.ChangeStamp)
and (FInternalChangeStamp = FLastInternalChangeStamp) and (FInternalChangeStamp = FLastInternalChangeStamp)
); );
if not Result then Exit; if not Result then Exit;
FCurProjectChangeStamp := LazarusIDE.ActiveProject.ChangeStamp; FCurProjectChangeStamp := LProjectChangeStamp;
FPackagesChangeStamp := PackageGraphInterface.ChangeStamp; FPackagesChangeStamp := PackageGraphInterface.ChangeStamp;
FLastInternalChangeStamp := FInternalChangeStamp; FLastInternalChangeStamp := FInternalChangeStamp;
end; end;
@ -786,6 +791,7 @@ var
xGroupTitle: string; xGroupTitle: string;
xGroupType: TGroupType; xGroupType: TGroupType;
begin begin
xActBtn := nil;
FRecreateToolBar.FLastFiles.Clear; FRecreateToolBar.FLastFiles.Clear;
FWindow.IncUpdateLock; FWindow.IncUpdateLock;
FWindow.DisableAlign; FWindow.DisableAlign;