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

add a missing break, don't double activate sockets

Browse source
This commit is contained in:
Stephen Birarda 2014-01-23 15:05:09 -08:00
parent 761bcb9825
commit ba7a73e347
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -132,9 +132,9 @@ void AvatarMixer::processDatagram(const QByteArray& dataByteArray, const HifiSoc
// parse positional data from an node // parse positional data from an node
nodeList->updateNodeWithData(avatarNode.data(), senderSockAddr, nodeList->updateNodeWithData(avatarNode.data(), senderSockAddr,
(unsigned char*) dataByteArray.data(), dataByteArray.size()); (unsigned char*) dataByteArray.data(), dataByteArray.size());
} else {
break;
} }
break;
} }
case PACKET_TYPE_KILL_NODE: case PACKET_TYPE_KILL_NODE:
default: default:

2
libraries/shared/src/NodeList.cpp
View file

@ -233,7 +233,7 @@ int NodeList::updateNodeWithData(Node *node, const HifiSockAddr& senderSockAddr,
node->setLastHeardMicrostamp(usecTimestampNow()); node->setLastHeardMicrostamp(usecTimestampNow());
if (!senderSockAddr.isNull()) { if (!senderSockAddr.isNull() && !node->getActiveSocket()) {
if (senderSockAddr == node->getPublicSocket()) { if (senderSockAddr == node->getPublicSocket()) {
node->activatePublicSocket(); node->activatePublicSocket();
} else if (senderSockAddr == node->getLocalSocket()) { } else if (senderSockAddr == node->getLocalSocket()) {