From 6e2a018f82a60f959335b22ce38d6932dcb33095 Mon Sep 17 00:00:00 2001
From: blikblum <blikblum@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 31 Dec 2012 13:45:43 +0000
Subject: [PATCH] * Remove unnecessary check for FHeader

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2609 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../branches/4.8/VirtualTrees.pas                | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas b/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
index 2391dfbf8..b17489f04 100644
--- a/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
+++ b/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
@@ -11354,8 +11354,7 @@ begin
   if HandleAllocated then
     DestroyWindowHandle;
   }
-  FHeader.Free;
-  FHeader := nil;
+  FreeAndNil(FHeader);
 
   if FCheckImages <> FCustomCheckImages then
     FCheckImages.Free;
@@ -22149,14 +22148,11 @@ begin
           PopupMenu := nil
         else
           // Check for components linked to the header.
-          if Assigned(FHeader) then
-          begin
-            if AComponent = FHeader.FImages then
-              FHeader.Images := nil
-            else
-              if AComponent = FHeader.PopupMenu then
-                FHeader.PopupMenu := nil;
-          end;
+          if AComponent = FHeader.FImages then
+            FHeader.Images := nil
+          else
+            if AComponent = FHeader.PopupMenu then
+              FHeader.PopupMenu := nil;
   end;
   inherited;
 end;