Merge pull request #15376 from SimonWalton-HiFi/delayed-node-adds-tweaks

Clear delayed Node-adds upon restart
This commit is contained in:
Shannon Romano 2019-04-16 11:27:15 -07:00 committed by GitHub
commit 7de56092f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -588,6 +588,8 @@ void LimitedNodeList::eraseAllNodes() {
foreach(const SharedNodePointer& killedNode, killedNodes) {
handleNodeKill(killedNode);
}
_delayedNodeAdds.clear();
}
void LimitedNodeList::reset() {
@ -755,7 +757,7 @@ void LimitedNodeList::delayNodeAdd(NewNodeInfo info) {
}
void LimitedNodeList::removeDelayedAdd(QUuid nodeUUID) {
auto it = std::find_if(_delayedNodeAdds.begin(), _delayedNodeAdds.end(), [&](auto info) {
auto it = std::find_if(_delayedNodeAdds.begin(), _delayedNodeAdds.end(), [&](const auto& info) {
return info.uuid == nodeUUID;
});
if (it != _delayedNodeAdds.end()) {
@ -764,7 +766,7 @@ void LimitedNodeList::removeDelayedAdd(QUuid nodeUUID) {
}
bool LimitedNodeList::isDelayedNode(QUuid nodeUUID) {
auto it = std::find_if(_delayedNodeAdds.begin(), _delayedNodeAdds.end(), [&](auto info) {
auto it = std::find_if(_delayedNodeAdds.begin(), _delayedNodeAdds.end(), [&](const auto& info) {
return info.uuid == nodeUUID;
});
return it != _delayedNodeAdds.end();