From 9d3b0f607507190efea0c3d8d1cf504c7b317016 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 Feb 2016 00:37:59 +0200
Subject: [PATCH] fix https://github.com/vector-im/vector-web/issues/913

---
 src/components/views/rooms/MemberList.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 3cddee8632..4e8f38b035 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -35,21 +35,23 @@ var invite_defer = q.defer();
 
 module.exports = React.createClass({
     displayName: 'MemberList',
+
     getInitialState: function() {
-        if (!this.props.roomId) return { members: [] };
-        var cli = MatrixClientPeg.get();
-        var room = cli.getRoom(this.props.roomId);
-        if (!room) return { members: [] };
-
-        this.memberDict = this.getMemberDict();
-
-        var members = this.roomMembers(INITIAL_LOAD_NUM_MEMBERS);
-        return {
-            members: members,
+        var state = {
+            members: [],
             // ideally we'd size this to the page height, but
             // in practice I find that a little constraining
             truncateAt: INITIAL_LOAD_NUM_MEMBERS,
         };
+        if (!this.props.roomId) return state;
+        var cli = MatrixClientPeg.get();
+        var room = cli.getRoom(this.props.roomId);
+        if (!room) return state;
+
+        this.memberDict = this.getMemberDict();
+
+        state.members = this.roomMembers(INITIAL_LOAD_NUM_MEMBERS);
+        return state;
     },
 
     componentWillMount: function() {