Only view welcome user if we are not looking at a room

2017-06-05 14:07:24 +01:00 · 2017-06-05 14:07:24 +01:00 · c82e79ab5f
parent cdd8cc41e2
commit c82e79ab5f
1 changed files with 3 additions and 2 deletions
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@ -892,13 +892,14 @@ module.exports = React.createClass({

            // Set the display name = user ID localpart
            MatrixClientPeg.get().setDisplayName(
-                MatrixClientPeg.get().getUserIdLocalpart()
+                MatrixClientPeg.get().getUserIdLocalpart(),
            );

            if (this.props.config.welcomeUserId) {
                createRoom({
                    dmUserId: this.props.config.welcomeUserId,
-                    andView: false,
+                    // Only view the welcome user if we're NOT looking at a room
+                    andView: !this.state.currentRoomId,
                });
                return;
            }