OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/21833/head
Luke Barnard 2017-06-05 14:07:24 +01:00
parent cdd8cc41e2
commit c82e79ab5f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/structures/MatrixChat.js
View File

@ -892,13 +892,14 @@ module.exports = React.createClass({
// Set the display name = user ID localpart // Set the display name = user ID localpart
MatrixClientPeg.get().setDisplayName( MatrixClientPeg.get().setDisplayName(
MatrixClientPeg.get().getUserIdLocalpart() MatrixClientPeg.get().getUserIdLocalpart(),
); );
if (this.props.config.welcomeUserId) { if (this.props.config.welcomeUserId) {
createRoom({ createRoom({
dmUserId: this.props.config.welcomeUserId, 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; return;
} }