Merge branch 'develop' into hs/purge-irc-hack

2018-10-03 19:39:14 +01:00
parent fe788486b7 1189b75409
commit 17915b5082
199 changed files with 11956 additions and 10603 deletions
@@ -72,14 +72,12 @@ export default React.createClass({

    _updateRelatedGroups() {
        if (this.unmounted) return;
-        const relatedGroupsEvent = this.context.matrixClient
-            .getRoom(this.props.mxEvent.getRoomId())
-            .currentState
-            .getStateEvents('m.room.related_groups', '');
+        const room = this.context.matrixClient.getRoom(this.props.mxEvent.getRoomId());
+        if (!room) return;
+
+        const relatedGroupsEvent = room.currentState.getStateEvents('m.room.related_groups', '');
        this.setState({
-            relatedGroups: relatedGroupsEvent ?
-                relatedGroupsEvent.getContent().groups || []
-                : [],
+            relatedGroups: relatedGroupsEvent ? relatedGroupsEvent.getContent().groups || [] : [],
        });
    },