summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-22 10:56:09 +0100
committerErik Johnston <erik@matrix.org>2014-08-22 10:56:16 +0100
commitf3cea238b9c51861965d31cd9352153338d6705b (patch)
tree98ab3e1a8628050be5ea9f17cc07f67b9e7fd2bd
parentKeep track of people's presence and query that when we update the members list. (diff)
downloadsynapse-f3cea238b9c51861965d31cd9352153338d6705b.tar.xz
Check if the membership message was for the room we were in before updating the membership list
-rw-r--r--webclient/room/room-controller.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index e204a27e04..58ba432ce5 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -152,6 +152,8 @@ angular.module('RoomController', ['ngSanitize', 'mUtilities'])
     };
 
     var updateMemberList = function(chunk) {
+        if (chunk.room_id != $scope.room_id) return;
+
         var isNewMember = !(chunk.target_user_id in $scope.members);
         if (isNewMember) {
             // FIXME: why are we copying these fields around inside chunk?