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

Merge pull request #461 from matrix-org/dbkr/dont_reuse_parted_rooms 

Don't re-use parted rooms for DMs
pull/21833/head
David Baker 2016-09-12 18:30:55 +01:00 committed by GitHub
parent f6478f111a 6ffa7c23cd
commit e49547eb3e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/views/dialogs/ChatInviteDialog.js
View File

@ -248,10 +248,13 @@ module.exports = React.createClass({
for (let i = 0; i < dmRooms.length; i++) { for (let i = 0; i < dmRooms.length; i++) {
let room = MatrixClientPeg.get().getRoom(dmRooms[i]); let room = MatrixClientPeg.get().getRoom(dmRooms[i]);
if (room) { if (room) {
const me = room.getMember(MatrixClientPeg.get().credentials.userId);
if (me.membership == 'join') {
return room; return room;
} }
} }
} }
}
return null; return null;
}, },