Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:24:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/networking/src/LimitedNodeList.cpp
View file

@ -588,6 +588,8 @@ void LimitedNodeList::eraseAllNodes() {
foreach(const SharedNodePointer& killedNode, killedNodes) { foreach(const SharedNodePointer& killedNode, killedNodes) {
handleNodeKill(killedNode); handleNodeKill(killedNode);
} }
_delayedNodeAdds.clear();
} }
void LimitedNodeList::reset() { void LimitedNodeList::reset() {
@ -755,7 +757,7 @@ void LimitedNodeList::delayNodeAdd(NewNodeInfo info) {
} }
void LimitedNodeList::removeDelayedAdd(QUuid nodeUUID) { 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; return info.uuid == nodeUUID;
}); });
if (it != _delayedNodeAdds.end()) { if (it != _delayedNodeAdds.end()) {
@ -764,7 +766,7 @@ void LimitedNodeList::removeDelayedAdd(QUuid nodeUUID) {
} }
bool LimitedNodeList::isDelayedNode(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 info.uuid == nodeUUID;
}); });
return it != _delayedNodeAdds.end(); return it != _delayedNodeAdds.end();