Skip to content

Commit 881adfc

Browse files
committed
Fix issues with connection id's
1 parent 8dff467 commit 881adfc

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

src/app/models/connectionsmanager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ bool ConnectionsManager::loadConnectionsConfigFromFile(const QString& config,
124124

125125
if (conf.isNull()) continue;
126126

127+
conf.setId(QUuid::createUuid().toByteArray());
127128
addNewConnection(conf, false, group);
128129
}
129130

src/modules/connections-tree/items/databaseitem.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ DatabaseItem::DatabaseItem(unsigned int index, int keysCount,
2323
: AbstractNamespaceItem(model, parent, operations, index),
2424
m_keysCount(keysCount) {}
2525

26-
DatabaseItem::~DatabaseItem() {
27-
if (m_operations) m_operations->notifyDbWasUnloaded(m_dbIndex);
28-
}
26+
DatabaseItem::~DatabaseItem() {}
2927

3028
QByteArray DatabaseItem::getName() const { return QByteArray(); }
3129

src/modules/connections-tree/items/serveritem.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,15 @@ void ServerItem::unload() {
117117
emit m_model.itemChildsUnloaded(m_self);
118118

119119
m_operations->disconnect();
120+
121+
for (auto db : m_databases) {
122+
auto dbItem = db.staticCast<DatabaseItem>();
123+
124+
if (dbItem && m_operations) {
125+
m_operations->notifyDbWasUnloaded(dbItem->getDbIndex());
126+
}
127+
}
128+
120129
m_databases.clear();
121130

122131
unlock();

0 commit comments

Comments
 (0)