Skip to content

Commit

Permalink
Merge pull request #4282 from vector-im/dbkr/dont_show_emptycontent_i…
Browse files Browse the repository at this point in the history
…n_search

Don't show the tooltips when filtering rooms
  • Loading branch information
dbkr committed Jun 12, 2017
2 parents bbb9dd9 + 91295c6 commit 1bb7c54
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/components/structures/RoomSubList.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 1bb7c54

Please sign in to comment.