From 6eb0e8a2267e159ea4e9ec21468472f581e5f1ea Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Tue, 3 Nov 2009 23:58:55 +0000
Subject: [PATCH] After a DROP DATABASE the database node was kept in dbtree.
 Also, if the db did not exist while dropping, that lead to weird effects in
 FetchDbTableList(). Fixes issue #1431.

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

diff --git a/source/main.pas b/source/main.pas
index 0f10ae3e..8956c67e 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -1570,6 +1570,7 @@ begin
     comboOnlyDBs.ItemIndex := 0
   else
     comboOnlyDBs.Text := '';
+  FreeAndNil(AllDatabases);
   RefreshTree(False);
 
   DBTree.Color := GetRegValue(REGNAME_TREEBACKGROUND, clWindow, SessionName);
@@ -2251,10 +2252,11 @@ begin
         Screen.Cursor := crHourglass;
         try
           Connection.Query('DROP DATABASE ' + mask(activeDB));
-          ClearDbTableList(activeDB);
-          DBtree.Selected[DBtree.GetFirst] := true;
-          RefreshTree(False);
         finally
+          DBtree.FocusedNode := DBtree.GetFirst;
+          DBTree.Selected[DBtree.FocusedNode] := True;
+          ClearDbTableList(activeDB);
+          RefreshTree(False);
           Screen.Cursor := crDefault;
         end;
         Exit;