From a4125c1507e1e7f4defa73969579c70d0ae3ed5d Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Thu, 4 May 2017 16:33:50 -0700
Subject: [PATCH] logic tweak

---
 scripts/system/makeUserConnection.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/system/makeUserConnection.js b/scripts/system/makeUserConnection.js
index 7509b246ea..6f7b746f18 100644
--- a/scripts/system/makeUserConnection.js
+++ b/scripts/system/makeUserConnection.js
@@ -760,7 +760,10 @@
             break;
         case "done":
             delete waitingList[senderID];
-            if (state === STATES.CONNECTING && connectingId === senderID) {
+            if (connectionId !== senderID) {
+                break;
+            }
+            if (state === STATES.CONNECTING) {
                 // if they are done, and didn't connect us, terminate our
                 // connecting
                 if (message.connectionId !== MyAvatar.sessionUUID) {
@@ -776,7 +779,7 @@
                     stopConnecting();
                 }
             } else {
-                if (state == STATES.MAKING_CONNECTION && connectingId === senderID) {
+                if (state == STATES.MAKING_CONNECTION) {
                     // we are making connection, they just started, so lets reset the
                     // poll count just in case
                     pollCount = 0;