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

Fix automerge error.

Browse Source
This commit is contained in:
Richard Lewis
2017-06-27 11:52:49 +01:00
parent ddc0da396d
commit 89f051e693
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,6 +238,7 @@ module.exports = React.createClass({
if (room) { if (room) {
this.setState({ this.setState({
unsentMessageError: this._getUnsentMessageError(room), unsentMessageError: this._getUnsentMessageError(room),
showApps: this._shouldShowApps(room),
}); });
this._onRoomLoaded(room); this._onRoomLoaded(room);
} }
@ -272,11 +273,6 @@ module.exports = React.createClass({
} else if (room) { } else if (room) {
// Stop peeking because we have joined this room previously // Stop peeking because we have joined this room previously
MatrixClientPeg.get().stopPeeking(); MatrixClientPeg.get().stopPeeking();
this.setState({
showApps: this._shouldShowApps(room),
unsentMessageError: this._getUnsentMessageError(room),
});
this._onRoomLoaded(room);
} }
}, },