From 32c905524ee80e29622fb2bb26a8000ec5e01c8a Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Fri, 28 May 2010 22:48:20 +0000
Subject: [PATCH] Set result grid's parent control *before* hiding it. Fixes
 issue #1973.

---
 source/main.pas | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index 265d16be..eaf59591 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -8991,10 +8991,13 @@ end;
 { TQueryTab }
 
 function TQueryTab.GetActiveResultTab: TResultTab;
+var
+  idx: Integer;
 begin
   Result := nil;
-  if tabsetQuery.TabIndex > -1 then
-    Result := ResultTabs[tabsetQuery.TabIndex];
+  idx := tabsetQuery.TabIndex;
+  if (idx > -1) and (idx < ResultTabs.Count) then
+    Result := ResultTabs[idx];
 end;
 
 
@@ -9007,10 +9010,10 @@ var
 begin
   inherited;
   QueryTab := Mainform.ActiveQueryTab;
-  Grid := TVirtualStringTree.Create(QueryTab.TabSheet);
-  Grid.Visible := False;
   OrgGrid := Mainform.QueryGrid;
+  Grid := TVirtualStringTree.Create(QueryTab.TabSheet);
   Grid.Parent := QueryTab.TabSheet;
+  Grid.Visible := False;
   Grid.Tag := OrgGrid.Tag;
   Grid.BorderStyle := OrgGrid.BorderStyle;
   Grid.Align := OrgGrid.Align;