History

fix recursive mutex lock, conditional, logging

Stephen Birarda committed 10 years ago

Commit 441b6d21 parent bb68e773 files · +7 −5Browse files

Showing the changes to libraries/script-engine/src/UsersScriptingInterface.cpp (1 of 3 files). Show all

Unified · Split

libraries/script-engine/src/UsersScriptingInterface.cpp+5−3
@@ -21,10 +21,10 @@ void UsersScriptingInterface::ignore(const QUuid& nodeID) { · 20 unmodified lines
21 auto nodeList = DependencyManager::get<NodeList>();21 auto nodeList = DependencyManager::get<NodeList>();
22 22
23 nodeList->eachMatchingNode([&nodeID](const SharedNodePointer& node)->bool {23 nodeList->eachMatchingNode([&nodeID](const SharedNodePointer& node)->bool {
24 if (node->getType() != NodeType::AudioMixer || node->getType() != NodeType::AvatarMixer) {24 if (node->getType() == NodeType::AudioMixer || node->getType() == NodeType::AvatarMixer) {
25 return false;
26 } else {
27 return true;25 return true;
26 } else {
27 return false;
28 }28 }
29 }, [&nodeID, &nodeList](const SharedNodePointer& destinationNode) {29 }, [&nodeID, &nodeList](const SharedNodePointer& destinationNode) {
30 // create a reliable NLPacket with space for the ignore UUID30 // create a reliable NLPacket with space for the ignore UUID
@@ -33,6 +33,8 @@ void UsersScriptingInterface::ignore(const QUuid& nodeID) { · 2 unmodified lines
33 // write the node ID to the packet33 // write the node ID to the packet
34 ignorePacket->write(nodeID.toRfc4122());34 ignorePacket->write(nodeID.toRfc4122());
35 35
36 qDebug() << "Sending packet to ignore node" << uuidStringWithoutCurlyBraces(nodeID);
37
36 // send off this ignore packet reliably to the matching node38 // send off this ignore packet reliably to the matching node
37 nodeList->sendPacket(std::move(ignorePacket), *destinationNode);39 nodeList->sendPacket(std::move(ignorePacket), *destinationNode);
38 });40 });