mirror of https://github.com/vector-im/riot-web
Merge remote-tracking branch 'origin/develop' into develop
commit
1ce1d36e99
|
@ -530,7 +530,7 @@ var RoomSubList = React.createClass({
|
|||
var label = this.props.collapsed ? null : this.props.label;
|
||||
|
||||
let content;
|
||||
if (this.state.sortedList.length == 0) {
|
||||
if (this.state.sortedList.length == 0 && !this.props.searchFilter) {
|
||||
content = this.props.emptyContent;
|
||||
} else {
|
||||
content = this.makeRoomTiles();
|
||||
|
|
Loading…
Reference in New Issue