imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some races due to promises completing after we've switched rooms

Browse source 
Add a few isMounted() checks to promise handlers so that we don't end up
throwing NPEs.
This commit is contained in:
Richard van der Hoff 2016-01-08 12:03:45 +00:00
parent 8170288acb
commit 62cf34b58c
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/structures/ScrollPanel.js
View file

@ -158,6 +158,10 @@ module.exports = React.createClass({
// check the scroll state and send out backfill requests if necessary.
checkFillState: function() {
if (!this.isMounted()) {
return;
}
var sn = this._getScrollNode();
// if there is less than a screenful of messages above or below the
@ -346,6 +350,12 @@ module.exports = React.createClass({
* message panel.
*/
_getScrollNode: function() {
if (!this.isMounted()) {
// this shouldn't happen, but when it does, turn the NPE into
// something more meaningful.
throw new Error("ScrollPanel._getScrollNode called when unmounted");
}
var panel = ReactDOM.findDOMNode(this.refs.geminiPanel);
// If the gemini scrollbar is doing its thing, this will be a div within