OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #585 from matrix-org/dbkr/fix_exception_roomdir 

Fix exception when clearing room dir search
pull/21833/head
Richard van der Hoff 2016-12-06 15:58:07 +00:00 committed by GitHub
parent fe0dc85d66 9e3c94edf4
commit 587325b36c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/structures/ScrollPanel.js
View File

@ -402,6 +402,9 @@ module.exports = React.createClass({
q.finally(fillPromise, () => { q.finally(fillPromise, () => {
this._pendingFillRequests[dir] = false; this._pendingFillRequests[dir] = false;
}).then((hasMoreResults) => { }).then((hasMoreResults) => {
if (this.unmounted) {
return;
}
// Unpaginate once filling is complete // Unpaginate once filling is complete
this._checkUnfillState(!backwards); this._checkUnfillState(!backwards);