fix NPE

2014-09-23 13:01:12 +01:00 · 2014-09-23 13:01:12 +01:00 · 997a016122
parent 512f2cc9c4
commit 997a016122
1 changed files with 1 additions and 2 deletions
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@ -260,8 +260,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
            if (event.content.prev !== event.content.membership) {
                memberChanges = "membership";
            }
-            else if (event.prev_content.displayname !== 
-                     event.content.displayname) {
+            else if (event.prev_content && (event.prev_content.displayname !== event.content.displayname)) {
                memberChanges = "displayname";
            }