From e65c67ca153758de8803aed515b2d36ac2759e93 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 18 Dec 2017 22:47:18 +0000
Subject: [PATCH] fix https://github.com/vector-im/riot-web/issues/5841
---
src/components/structures/MatrixChat.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 3ac2f5bd50..7ee18364df 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1065,10 +1065,10 @@ export default React.createClass({
// this if we are not scrolled up in the view. To find out, delegate to
// the timeline panel. If the timeline panel doesn't exist, then we assume
// it is safe to reset the timeline.
- if (!self._loggedInView) {
+ if (!self._loggedInView || !self._loggedInView.child) {
return true;
}
- return self._loggedInView.canResetTimelineInRoom(roomId);
+ return self._loggedInView.child.canResetTimelineInRoom(roomId);
});
cli.on('sync', function(state, prevState) {