From 14895fc559fbbdd0bf394c5fa678a041d17ad5b8 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 30 Jan 2022 13:57:44 +0100 Subject: [PATCH] Allow removing uninitialized nodes --- libnymea-zigbee/zigbeenetwork.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libnymea-zigbee/zigbeenetwork.cpp b/libnymea-zigbee/zigbeenetwork.cpp index 2c76c3c..ba690d8 100644 --- a/libnymea-zigbee/zigbeenetwork.cpp +++ b/libnymea-zigbee/zigbeenetwork.cpp @@ -451,8 +451,8 @@ void ZigbeeNetwork::addNodeInternally(ZigbeeNode *node) void ZigbeeNetwork::removeNodeInternally(ZigbeeNode *node) { - if (!m_nodes.contains(node)) { - qCWarning(dcZigbeeNetwork()) << "Try to remove node" << node << "but not in the node list."; + if (!m_nodes.contains(node) && !m_uninitializedNodes.contains(node)) { + qCWarning(dcZigbeeNetwork()) << "Cannot remove unknown node:" << node; return; } @@ -461,6 +461,7 @@ void ZigbeeNetwork::removeNodeInternally(ZigbeeNode *node) } m_nodes.removeAll(node); + m_uninitializedNodes.removeAll(node); emit nodeRemoved(node); m_database->removeNode(node);