matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00
Code Activity

Unbreak auto joining

Browse Source
This commit is contained in:
Luke Barnard
2017-06-15 13:35:19 +01:00
parent fc7da536d6
commit 5c37d591b0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/RoomView.js
View File

@ -231,10 +231,10 @@ module.exports = React.createClass({
this._updateAutoComplete(room);
this.tabComplete.loadEntries(room);
}
if (!room && !this.state.joining && this.state.roomId) {
if (!this.state.joining && this.state.roomId) {
if (this.props.autoJoin) {
this.onJoinButtonClicked();
} else {
} else if (!room) {
console.log("Attempting to peek into room %s", this.state.roomId);
this.setState({
peekLoading: true,