diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 2f085dc3cb..e2d6b277a7 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -425,7 +425,6 @@ qint64 LimitedNodeList::sendPacket(std::unique_ptr packet, const Node& } int LimitedNodeList::updateNodeWithDataFromPacket(QSharedPointer message, SharedNodePointer sendingNode) { - QMutexLocker locker(&sendingNode->getMutex()); NodeData* linkedData = getOrCreateLinkedData(sendingNode); diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp index 27598d10ae..4615c61506 100644 --- a/libraries/networking/src/Node.cpp +++ b/libraries/networking/src/Node.cpp @@ -82,7 +82,8 @@ void Node::handleNodeIgnoreRequest(QSharedPointer packet) { // parse out the UUID being ignored from the packet QUuid ignoredUUID = QUuid::fromRfc4122(packet->readWithoutCopy(NUM_BYTES_RFC4122_UUID)); - qDebug() << "Adding" << ignoredUUID << "to ignore set for" << _uuid; + qDebug() << "Adding" << uuidStringWithoutCurlyBraces(ignoredUUID) << "to ignore set for" + << uuidStringWithoutCurlyBraces(_uuid); // add the session UUID to the set of ignored ones for this listening node _ignoredNodeIDSet.insert(ignoredUUID); diff --git a/libraries/script-engine/src/UsersScriptingInterface.cpp b/libraries/script-engine/src/UsersScriptingInterface.cpp index 3a05d81de1..94c448ac86 100644 --- a/libraries/script-engine/src/UsersScriptingInterface.cpp +++ b/libraries/script-engine/src/UsersScriptingInterface.cpp @@ -21,10 +21,10 @@ void UsersScriptingInterface::ignore(const QUuid& nodeID) { auto nodeList = DependencyManager::get(); nodeList->eachMatchingNode([&nodeID](const SharedNodePointer& node)->bool { - if (node->getType() != NodeType::AudioMixer || node->getType() != NodeType::AvatarMixer) { - return false; - } else { + if (node->getType() == NodeType::AudioMixer || node->getType() == NodeType::AvatarMixer) { return true; + } else { + return false; } }, [&nodeID, &nodeList](const SharedNodePointer& destinationNode) { // create a reliable NLPacket with space for the ignore UUID @@ -33,6 +33,8 @@ void UsersScriptingInterface::ignore(const QUuid& nodeID) { // write the node ID to the packet ignorePacket->write(nodeID.toRfc4122()); + qDebug() << "Sending packet to ignore node" << uuidStringWithoutCurlyBraces(nodeID); + // send off this ignore packet reliably to the matching node nodeList->sendPacket(std::move(ignorePacket), *destinationNode); });