Handle null from TimelinePanel.getScrollState in RoomView _getScrollState

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2019-10-03 23:00:08 +01:00
parent 359d2fee5f
commit 9e8234c98f
1 changed files with 2 additions and 1 deletions

View File

@ -1417,7 +1417,8 @@ module.exports = createReactClass({
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
// occasionally happen when no scroll state has been set on the
// messagePanel (ie, we didn't have an initial event (so it's