Fix issues with connection id's

RedisInsight · Nov 20, 2020 · 881adfc · 881adfc
1 parent 8dff467
commit 881adfc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/3rdparty/qredisclient b/3rdparty/qredisclient
diff --git a/src/app/models/connectionsmanager.cpp b/src/app/models/connectionsmanager.cpp
@@ -124,6 +124,7 @@ bool ConnectionsManager::loadConnectionsConfigFromFile(const QString& config,
 
         if (conf.isNull()) continue;
 
+        conf.setId(QUuid::createUuid().toByteArray());
         addNewConnection(conf, false, group);
       }
 

diff --git a/src/modules/connections-tree/items/databaseitem.cpp b/src/modules/connections-tree/items/databaseitem.cpp
@@ -23,9 +23,7 @@ DatabaseItem::DatabaseItem(unsigned int index, int keysCount,
     : AbstractNamespaceItem(model, parent, operations, index),
       m_keysCount(keysCount) {}
 
-DatabaseItem::~DatabaseItem() {
-  if (m_operations) m_operations->notifyDbWasUnloaded(m_dbIndex);
-}
+DatabaseItem::~DatabaseItem() {}
 
 QByteArray DatabaseItem::getName() const { return QByteArray(); }
 

diff --git a/src/modules/connections-tree/items/serveritem.cpp b/src/modules/connections-tree/items/serveritem.cpp
@@ -117,6 +117,15 @@ void ServerItem::unload() {
   emit m_model.itemChildsUnloaded(m_self);
 
   m_operations->disconnect();
+
+  for (auto db : m_databases) {
+      auto dbItem = db.staticCast<DatabaseItem>();
+
+      if (dbItem && m_operations) {
+          m_operations->notifyDbWasUnloaded(dbItem->getDbIndex());
+      }
+  }
+
   m_databases.clear();
 
   unlock();