Fix user links
'Start chat' was broken on the sidebar if the panel was displayed by clicking on a link to a user. This adds null checking for the hack that we use to display users in the member panel.
This commit is contained in:
parent
98c03869a7
commit
c016eb78c8
1 changed files with 8 additions and 3 deletions
|
@ -358,10 +358,15 @@ module.exports = React.createClass({
|
||||||
];
|
];
|
||||||
var existingRoomId;
|
var existingRoomId;
|
||||||
|
|
||||||
var currentRoom = MatrixClientPeg.get().getRoom(this.props.member.roomId);
|
// roomId can be null here because of a hack in MatrixChat.onUserClick where we
|
||||||
var currentMembers = currentRoom.getJoinedMembers();
|
// abuse this to view users rather than room members.
|
||||||
|
var currentMembers;
|
||||||
|
if (this.props.member.roomId) {
|
||||||
|
var currentRoom = MatrixClientPeg.get().getRoom(this.props.member.roomId);
|
||||||
|
currentMembers = currentRoom.getJoinedMembers();
|
||||||
|
}
|
||||||
// if we're currently in a 1:1 with this user, start a new chat
|
// if we're currently in a 1:1 with this user, start a new chat
|
||||||
if (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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue