From b49798fee4c8befbe062f1bffb5eb0ce4c2a4893 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Sun, 8 May 2011 06:00:22 +0000 Subject: [PATCH] Connection object may have been destroyed when accessing Mainform.ActiveDatabase. Fixes issue #2407. --- source/main.pas | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/main.pas b/source/main.pas index 9203510b..df9db3b0 100644 --- a/source/main.pas +++ b/source/main.pas @@ -5550,7 +5550,9 @@ function TMainForm.GetActiveDatabase: String; begin // Find currently selected database in active connection Result := ''; - if (not (csDestroying in ComponentState)) and Assigned(FActiveDBObj) then + if (not (csDestroying in ComponentState)) + and Assigned(FActiveDBObj) + and Assigned(FActiveDBObj.Connection) then Result := FActiveDBObj.Connection.Database; end;