Allow removing uninitialized nodes
This commit is contained in:
parent
bfb1ab56f2
commit
14895fc559
@ -451,8 +451,8 @@ void ZigbeeNetwork::addNodeInternally(ZigbeeNode *node)
|
|||||||
|
|
||||||
void ZigbeeNetwork::removeNodeInternally(ZigbeeNode *node)
|
void ZigbeeNetwork::removeNodeInternally(ZigbeeNode *node)
|
||||||
{
|
{
|
||||||
if (!m_nodes.contains(node)) {
|
if (!m_nodes.contains(node) && !m_uninitializedNodes.contains(node)) {
|
||||||
qCWarning(dcZigbeeNetwork()) << "Try to remove node" << node << "but not in the node list.";
|
qCWarning(dcZigbeeNetwork()) << "Cannot remove unknown node:" << node;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -461,6 +461,7 @@ void ZigbeeNetwork::removeNodeInternally(ZigbeeNode *node)
|
|||||||
}
|
}
|
||||||
|
|
||||||
m_nodes.removeAll(node);
|
m_nodes.removeAll(node);
|
||||||
|
m_uninitializedNodes.removeAll(node);
|
||||||
emit nodeRemoved(node);
|
emit nodeRemoved(node);
|
||||||
|
|
||||||
m_database->removeNode(node);
|
m_database->removeNode(node);
|
||||||
|
|||||||
Reference in New Issue
Block a user