Connection object may have been destroyed when accessing Mainform.ActiveDatabase. Fixes issue #2407.

This commit is contained in:
Ansgar Becker
2011-05-08 06:00:22 +00:00
parent 57b306c2ce
commit b49798fee4

View File

@@ -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;