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

2017-06-12 17:09:57 +00:00 · 2017-06-12 17:09:57 +00:00 · 1ce1d36e99
parent 2be54f58fe 1bb7c54ab4
commit 1ce1d36e99
1 changed files with 1 additions and 1 deletions
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@ -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();