From 24eac771159b57276001409a12d7f2d6412ca85f Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 29 Dec 2016 11:57:51 -0800
Subject: [PATCH] I'm about to refactor this.

---
 assignment-client/src/audio/AudioMixer.cpp |  2 +-
 interface/resources/qml/hifi/Pal.qml       |  6 +++---
 libraries/networking/src/Node.cpp          | 18 ++++++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index c9b00eb874..d1f7abf379 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -245,7 +245,7 @@ void AudioMixer::handleNodePersonalMuteRequestPacket(QSharedPointer<ReceivedMess
                 << uuidStringWithoutCurlyBraces(_uuid);
 
             // Remove the session UUID to the set of personally muted ones for this listening node
-            //sendingNode->removeIgnoredNode(ignoredUUID);
+            sendingNode->removeIgnoredNode(ignoredUUID);
         }
     } else {
         qWarning() << "Node::handlePersonalMutedNode called with null ID or ID of personal muting node.";
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index fc55916832..2c75e8f049 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -386,7 +386,7 @@ Item {
                 // Get the index in userModel and userData associated with the passed UUID
                 var userIndex = findSessionIndex(userId);
                 // Set the userName appropriately
-                userModel.get(userIndex).userName = userName;
+                userModel.setProperty(userIndex, "userName", userName);
                 userData[userIndex].userName = userName; // Defensive programming
             }
             break;
@@ -399,7 +399,7 @@ Item {
                     myCard.audioLevel = audioLevel; // Defensive programming
                 } else {
                     var userIndex = findSessionIndex(userId);
-                    userModel.get(userIndex).audioLevel = audioLevel;
+                    userModel.setProperty(userIndex, "audioLevel", audioLevel);
                     userData[userIndex].audioLevel = audioLevel; // Defensive programming
                 }
             }
@@ -408,7 +408,7 @@ Item {
             var userId = message.params[0];
             var enabled = message.params[1];
             var userIndex = findSessionIndex(userId);
-            userModel.get(userIndex).personalMute.property = enabled;
+            userModel.setProperty(userIndex, "personalMute", enabled);
             userData[userIndex].personalMute.property = enabled; // Defensive programming
             break;
     default:
diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp
index b2670fd9b0..484ea882b5 100644
--- a/libraries/networking/src/Node.cpp
+++ b/libraries/networking/src/Node.cpp
@@ -82,15 +82,17 @@ void Node::updateClockSkewUsec(qint64 clockSkewSample) {
 }
 
 void Node::parseIgnoreRequestMessage(QSharedPointer<ReceivedMessage> message) {
-    // parse out the UUID being ignored from the packet
-    QUuid ignoredUUID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
-    bool addToIgnore;
-    message->readPrimitive(&addToIgnore);
+    while (message->getBytesLeftToRead()) {
+        // parse out the UUID being ignored from the packet
+        QUuid ignoredUUID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
+        bool addToIgnore;
+        message->readPrimitive(&addToIgnore);
 
-    if (addToIgnore) {
-        addIgnoredNode(ignoredUUID);
-    } else {
-        removeIgnoredNode(ignoredUUID);
+        if (addToIgnore) {
+            addIgnoredNode(ignoredUUID);
+        } else {
+            removeIgnoredNode(ignoredUUID);
+        }
     }
 }