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

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

Browse Source
This commit is contained in:
David Baker
2018-07-18 09:35:57 +01:00
parent 983dc3ad2e 0a432dfb8f
commit 7aab6fa6f1
53 changed files with 1685 additions and 1247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,11 +308,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});
}
},