From ba7a73e347606dca0fac2fcbbbf99922a420105c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 23 Jan 2014 15:05:09 -0800
Subject: [PATCH] add a missing break, don't double activate sockets

---
 assignment-client/src/avatars/AvatarMixer.cpp | 4 ++--
 libraries/shared/src/NodeList.cpp             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index 2f7c4a83d4..28b8358742 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -132,9 +132,9 @@ void AvatarMixer::processDatagram(const QByteArray& dataByteArray, const HifiSoc
                 // parse positional data from an node
                 nodeList->updateNodeWithData(avatarNode.data(), senderSockAddr,
                                              (unsigned char*) dataByteArray.data(), dataByteArray.size());
-            } else {
-                break;
+                
             }
+            break;
         }
         case PACKET_TYPE_KILL_NODE:
         default:
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index 7272a41cb1..da35fa92ae 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -233,7 +233,7 @@ int NodeList::updateNodeWithData(Node *node, const HifiSockAddr& senderSockAddr,
 
     node->setLastHeardMicrostamp(usecTimestampNow());
 
-    if (!senderSockAddr.isNull()) {
+    if (!senderSockAddr.isNull() && !node->getActiveSocket()) {
         if (senderSockAddr == node->getPublicSocket()) {
             node->activatePublicSocket();
         } else if (senderSockAddr == node->getLocalSocket()) {