Merge pull request #675 from matrix-org/dbkr/fix_timeline_notifs_empty

Fix timeline & notifs panel spuriously being empty
2017-02-03 11:35:28 +00:00 · 2017-02-03 11:35:28 +00:00 · 5df5fed6f5
parent 2b67c1245f 470e760e42
commit 5df5fed6f5
1 changed files with 1 additions and 1 deletions
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@ -993,7 +993,7 @@ var TimelinePanel = React.createClass({
            );
        }

-        if (this.state.events.length == 0) {
+        if (this.state.events.length == 0 && !this.state.canBackPaginate && this.props.empty) {
            return (
                    <div className={ this.props.className + " mx_RoomView_messageListWrapper" }>
                        <div className="mx_RoomView_empty">{ this.props.empty }</div>