Merge remote-tracking branch 'origin/develop' into develop

2017-11-06 14:10:32 +00:00
parent ba1ab9bdd1 a1512af9f9
commit 01401fe4f8
1 changed files with 2 additions and 1 deletions
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -127,8 +127,9 @@ module.exports = React.createClass({
    },

    _initGroupStore(groupId) {
+        if (!groupId) return;
        this._groupStore = GroupStoreCache.getGroupStore(
-            this.context.matrixClient, this.props.groupId,
+            this.context.matrixClient, groupId,
        );
        this._groupStore.registerListener(this.onGroupStoreUpdated);
    },