From f3cea238b9c51861965d31cd9352153338d6705b Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 22 Aug 2014 10:56:09 +0100
Subject: [PATCH] Check if the membership message was for the room we were in
 before updating the membership list

---
 webclient/room/room-controller.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index e204a27e0..58ba432ce 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?