From bc512a6e4c2e86eb8dac014620fddc37f21d9a14 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 4 Nov 2015 15:20:25 +0000
Subject: [PATCH] Check m.room.name event actually has a name in the content
 before using it. This should fix the recent disasters with #android being
 shown as 'undefined' (or crashing vector).

---
 lib/models/room.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/room.js b/lib/models/room.js
index 724ac559f..9ee1184f4 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -438,7 +438,7 @@ function calculateRoomName(room, userId) {
     // check for an alias, if any. for now, assume first alias is the
     // official one.
     var mRoomName = room.currentState.getStateEvents("m.room.name", "");
-    if (mRoomName) {
+    if (mRoomName && mRoomName.getContent() && mRoomName.getContent().name) {
         return mRoomName.getContent().name;
     }