From cf1feee21d7c79855a3d4b32f5d282b49f6218f5 Mon Sep 17 00:00:00 2001
From: giomfo <giom@matrix.org>
Date: Mon, 27 Oct 2014 14:16:59 +0100
Subject: [PATCH] HandleRoomMember: handle correctly prev_content

---
 webclient/components/matrix/event-handler-service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 112b3ad96c..e7109c0cb4 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -256,7 +256,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
             // could be a membership change, display name change, etc.
             // Find out which one.
             var memberChanges = undefined;
-            if (event.prev_content && (event.prev_content.membership !== event.content.membership)) {
+            if ((event.prev_content === undefined && event.content.membership) || (event.prev_content && (event.prev_content.membership !== event.content.membership))) {
                 memberChanges = "membership";
             }
             else if (event.prev_content && (event.prev_content.displayname !== event.content.displayname)) {
-- 
GitLab