Skip to content

Commit b375038

Browse files
committed
Fixed several bugs in connections tree
1 parent 48a7ace commit b375038

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

redis-desktop-manager/source/models/items/RedisKeyItem.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "RedisKeyItem.h"
2+
#include "RedisKeyNamespace.h"
23
#include "RedisServerItem.h"
34
#include "RedisServerDbItem.h"
45
#include "KeyModel.h"
@@ -78,14 +79,16 @@ Command RedisKeyItem::getTypeCommand()
7879

7980
ConnectionBridge * RedisKeyItem::getConnection()
8081
{
81-
if (db == nullptr)
82+
if (db == nullptr || db->server == nullptr)
8283
return nullptr;
8384

8485
return db->server->connection;
8586
}
8687

8788
void RedisKeyItem::remove()
8889
{
89-
db->decreaseKeyCounter();
90-
db->removeRow(this->row());
90+
if (db != nullptr)
91+
db->decreaseKeyCounter();
92+
93+
setEnabled(false);
9194
}

redis-desktop-manager/source/models/items/RedisServerDbItem.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,22 @@ void RedisServerDbItem::keysLoaded(const QVariant &keys, QObject *owner)
5757

5858
rawKeys = keys.toStringList();
5959

60-
int resultSize = rawKeys.size();
60+
keysCount = rawKeys.size();
6161

62-
if (resultSize == 0) {
62+
if (keysCount == 0) {
6363
server->unlockUI();
6464
setNormalIcon();
6565
return;
6666
}
6767

68-
if (resultSize < keysCount) {
68+
if (keysCount < keysCount) {
6969
server->error(QString("Loaded keys: %2 of %3. Error - %4 <br /> Check <a href='https://github.com/uglide/RedisDesktopManager/wiki/Known-issues'>documentation</a>")
70-
.arg(resultSize)
70+
.arg(keysCount)
7171
.arg(keysCount)
7272
.arg(server->connection->getLastError()));
7373
}
7474

75-
75+
setDbText();
7676
renderKeys(rawKeys);
7777

7878
setNormalIcon();

0 commit comments

Comments
 (0)