Fixed issue JAM-Software#760: TVirtualTreeColumns.GetFirstVisibleColu…

…mn() cause AV if called between BeginUpdate() and EndUpdate() # Conflicts: # CHANGES.txt
ValtsS · Jan 25, 2019 · 501e9bd · 501e9bd
1 parent a9d1e2a
commit 501e9bd
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Source/VirtualTrees.pas b/Source/VirtualTrees.pas
@@ -10642,6 +10642,8 @@ function TVirtualTreeColumns.GetFirstVisibleColumn(ConsiderAllowFocus: Boolean =
 
 begin
   Result := InvalidColumn;
+  if (UpdateCount > 0) or (csLoading in Header.TreeView.ComponentState) then
+    exit; // See issue #760
   for I := 0 to Count - 1 do
     if (coVisible in Items[FPositionToIndex[I]].FOptions) and
        ( (not ConsiderAllowFocus) or
@@ -10666,6 +10668,8 @@ function TVirtualTreeColumns.GetLastVisibleColumn(ConsiderAllowFocus: Boolean =
 
 begin
   Result := InvalidColumn;
+  if (UpdateCount > 0) or (csLoading in Header.TreeView.ComponentState) then
+    exit; // See issue #760
   for I := Count - 1 downto 0 do
     if (coVisible in Items[FPositionToIndex[I]].FOptions) and
        ( (not ConsiderAllowFocus) or