fix dm detection and conf call code with lazy loading

2018-07-25 16:10:49 +02:00
parent 7ea913ccec
commit d87d34030a
4 changed files with 29 additions and 27 deletions
@@ -342,8 +342,8 @@ module.exports = React.createClass({
                if (!taggedRoom) {
                    return;
                }
-                const me = taggedRoom.getMember(MatrixClientPeg.get().credentials.userId);
-                if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(taggedRoom, me, this.props.ConferenceHandler)) {
+                const myUserId = MatrixClientPeg.get().getUserId();
+                if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(taggedRoom, myUserId, this.props.ConferenceHandler)) {
                    return;
                }