Imported Upstream version 3.0.0upstream/3.0.0

1 files changed, 9 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp
index 98baaa9..8e137a4 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtree.cpp
@@ -1484,15 +1484,24 @@ void DbTree::deleteItems(const QList<DbTreeItem*>& itemsToDelete)
         return;
 
     // Deleting items
+    QSet<Db*> deletedDatabases;
     QSet<Db*> databasesToRefresh;
     for (DbTreeItem* item : items)
     {
+        if (item->getType() == DbTreeItem::Type::DB)
+            deletedDatabases << item->getDb();
+
         databasesToRefresh << item->getDb();
         deleteItem(item);
     }
 
     for (Db* dbToRefresh : databasesToRefresh)
+    {
+        if (deletedDatabases.contains(dbToRefresh))
+            continue;
+
         DBTREE->refreshSchema(dbToRefresh);
+    }
 }
 
 void DbTree::refreshSchemas()