Fix automerge error.
This commit is contained in:
parent
ddc0da396d
commit
89f051e693
1 changed files with 1 additions and 5 deletions
|
@ -238,6 +238,7 @@ module.exports = React.createClass({
|
|||
if (room) {
|
||||
this.setState({
|
||||
unsentMessageError: this._getUnsentMessageError(room),
|
||||
showApps: this._shouldShowApps(room),
|
||||
});
|
||||
this._onRoomLoaded(room);
|
||||
}
|
||||
|
@ -272,11 +273,6 @@ module.exports = React.createClass({
|
|||
} else if (room) {
|
||||
// Stop peeking because we have joined this room previously
|
||||
MatrixClientPeg.get().stopPeeking();
|
||||
this.setState({
|
||||
showApps: this._shouldShowApps(room),
|
||||
unsentMessageError: this._getUnsentMessageError(room),
|
||||
});
|
||||
this._onRoomLoaded(room);
|
||||
}
|
||||
},
|
||||
|
||||
|
|
Loading…
Reference in a new issue