Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-09-10 15:31:37 +00:00
commit ca771ec912

View file

@ -91,7 +91,9 @@ module.exports = React.createClass({
const cli = MatrixClientPeg.get();
const room = cli.getRoom(this.props.roomId);
if (room) {
await room.loadMembersIfNeeded();
try {
await room.loadMembersIfNeeded();
} catch(ex) {/* already logged in RoomView */}
}
},