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

fix comment

pull/21833/head
Matthew Hodgson 2016-07-17 19:00:22 +01:00
parent bfe50c209c
commit 999c52b650
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/rooms/MemberInfo.js
View File

@ -366,7 +366,7 @@ module.exports = React.createClass({
var currentRoom = MatrixClientPeg.get().getRoom(this.props.member.roomId); var currentRoom = MatrixClientPeg.get().getRoom(this.props.member.roomId);
currentMembers = currentRoom.getJoinedMembers(); currentMembers = currentRoom.getJoinedMembers();
} }
// if we're currently not in a 1:1 with this user, start a new chat // if our current room is a 1:1 with the target user, start a new chat rather than NOOPing
if (currentMembers && currentMembers.length === 2 && if (currentMembers && currentMembers.length === 2 &&
userIds.indexOf(currentMembers[0].userId) !== -1 && userIds.indexOf(currentMembers[0].userId) !== -1 &&
userIds.indexOf(currentMembers[1].userId) !== -1) userIds.indexOf(currentMembers[1].userId) !== -1)