From def104bb9d35239cb9110a9a837a505aa4affdae Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Thu, 26 May 2011 04:52:14 +0000
Subject: [PATCH] Some more safety against possible access violation in
 StatusBarDrawPanel. Fixes issue #2418

---
 source/main.pas | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index f57aa20b..0b06bcea 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -1060,13 +1060,17 @@ procedure TMainForm.StatusBarDrawPanel(StatusBar: TStatusBar; Panel: TStatusPane
 var
   PanelRect: TRect;
   ImageIndex: Integer;
+  Conn: TDBConnection;
 begin
   // Refresh one status bar panel, probably with icon
   ImageIndex := -1;
   case Panel.Index of
     2: ImageIndex := 149;
-    3: if (FActiveDbObj <> nil) and (Assigned(FActiveDbObj.Connection)) then
-      ImageIndex := FActiveDbObj.Connection.Parameters.ImageIndex;
+    3: begin
+      Conn := ActiveConnection;
+      if Conn <> nil then
+        ImageIndex := Conn.Parameters.ImageIndex;
+    end;
     6: begin
       if Panel.Text = SIdle then
         ImageIndex := 151 // Green dot