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

This commit is contained in:
Weblate 2018-07-16 12:33:19 +00:00
commit f76d9a7a97

View File

@ -299,11 +299,11 @@ module.exports = React.createClass({
throw err;
}
});
} else if (room) {
// Stop peeking because we have joined this room previously
MatrixClientPeg.get().stopPeeking();
this.setState({isPeeking: false});
}
} else if (room) {
// Stop peeking because we have joined this room previously
MatrixClientPeg.get().stopPeeking();
this.setState({isPeeking: false});
}
},