summary refs log tree commit diff
path: root/webclient/components
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-09-23 13:01:12 +0100
committerMatthew Hodgson <matthew@matrix.org>2014-09-23 13:01:12 +0100
commit997a016122218dd51ee0d2fb2ddac1c61fce455b (patch)
tree33a6ed17197b4c29d418911183c29bd551993db3 /webclient/components
parentFix SYWEB-8 : Buggy tab-complete. (diff)
downloadsynapse-997a016122218dd51ee0d2fb2ddac1c61fce455b.tar.xz
fix NPE
Diffstat (limited to 'webclient/components')
-rw-r--r--webclient/components/matrix/event-handler-service.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 21066e3d9f..9c19f306c0 100644
--- 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";
             }