mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3518 from matrix-org/t3chguy/attempt_NPE_fix

Browse source 
Handle null from TimelinePanel.getScrollState in RoomView _getScrollState
This commit is contained in:
Michael Telatynski 2019-10-04 00:25:14 +01:00 committed by GitHub
commit 47c41759f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/structures/RoomView.js
View file

@ -1417,7 +1417,8 @@ module.exports = createReactClass({
const scrollState = messagePanel.getScrollState(); const scrollState = messagePanel.getScrollState();
if (scrollState.stuckAtBottom) { // getScrollState on TimelinePanel *may* return null, so guard against that
if (!scrollState || scrollState.stuckAtBottom) {
// we don't really expect to be in this state, but it will // we don't really expect to be in this state, but it will
// occasionally happen when no scroll state has been set on the // occasionally happen when no scroll state has been set on the
// messagePanel (ie, we didn't have an initial event (so it's // messagePanel (ie, we didn't have an initial event (so it's