From 2460e89a574613ab615c05c0d2ba283a6d2a5d71 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Tue, 17 Jan 2017 09:53:04 -0800
Subject: [PATCH] CR feedback

---
 interface/src/avatar/AvatarManager.cpp | 2 +-
 libraries/networking/src/NodeList.cpp  | 3 +--
 libraries/networking/src/NodeList.h    | 2 +-
 scripts/system/pal.js                  | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interface/src/avatar/AvatarManager.cpp b/interface/src/avatar/AvatarManager.cpp
index 848218a27e..ef08a463f4 100644
--- a/interface/src/avatar/AvatarManager.cpp
+++ b/interface/src/avatar/AvatarManager.cpp
@@ -263,7 +263,7 @@ void AvatarManager::handleRemovedAvatar(const AvatarSharedPointer& removedAvatar
     }
     if (removalReason == KillAvatarReason::AvatarDisconnected) {
         // remove from node sets, if present
-        DependencyManager::get<NodeList>()->maintainIgnoreMuteSets(avatar->getSessionUUID());
+        DependencyManager::get<NodeList>()->removeFromIgnoreMuteSets(avatar->getSessionUUID());
         DependencyManager::get<UsersScriptingInterface>()->avatarDisconnected(avatar->getSessionUUID());
     }
     _avatarFades.push_back(removedAvatar);
diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp
index 8451b2c4a0..0fcd207b94 100644
--- a/libraries/networking/src/NodeList.cpp
+++ b/libraries/networking/src/NodeList.cpp
@@ -847,8 +847,7 @@ void NodeList::ignoreNodeBySessionID(const QUuid& nodeID, bool ignoreEnabled) {
     }
 }
 
-// removes this UUID from ignore and mute lists.  
-void NodeList::maintainIgnoreMuteSets(const QUuid& nodeID) {
+void NodeList::removeFromIgnoreMuteSets(const QUuid& nodeID) {
     // don't remove yourself, or nobody
     if (!nodeID.isNull() && _sessionUUID != nodeID) {
         QWriteLocker ignoredSetLocker{ &_ignoredSetLock };
diff --git a/libraries/networking/src/NodeList.h b/libraries/networking/src/NodeList.h
index 4cbe3b1c3b..c4564c0889 100644
--- a/libraries/networking/src/NodeList.h
+++ b/libraries/networking/src/NodeList.h
@@ -90,7 +90,7 @@ public:
     bool getRequestsDomainListData() { return _requestsDomainListData; }
     void setRequestsDomainListData(bool isRequesting);
 
-    void maintainIgnoreMuteSets(const QUuid& nodeID);
+    void removeFromIgnoreMuteSets(const QUuid& nodeID);
 
 public slots:
     void reset();
diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index 7ecce80480..fb0d2b310b 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -620,6 +620,7 @@ Script.scriptEnding.connect(function () {
     Window.domainConnectionRefused.disconnect(clearLocalQMLDataAndClosePAL);
     Messages.unsubscribe(CHANNEL);
     Messages.messageReceived.disconnect(receiveMessage);
+    Users.avatarDisconnected.disconnect(avatarDisconnected);
     off();
 });