move comment after rebase

This commit is contained in:
Bruno Windels 2018-07-16 15:39:19 +02:00
parent af07d73432
commit 201332d96c

View file

@ -309,12 +309,12 @@ module.exports = React.createClass({
}
});
} else if (room) {
//viewing a previously joined room, try to lazy load members
// Stop peeking because we have joined this room previously
MatrixClientPeg.get().stopPeeking();
this.setState({isPeeking: false});
//viewing a previously joined room, try to lazy load members
// lazy load members if enabled
if (SettingsStore.isFeatureEnabled('feature_lazyloading')) {
MatrixClientPeg.get().loadRoomMembersIfNeeded(room.roomId);