From 68e0192acc6b090f4236906e058fffa2a28e5ccc Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 23 Feb 2016 18:43:51 +0000 Subject: [PATCH] reinstate event-continuation logic Forgot to set prevEvent in the merge from develop, so we were never applying the correct continuation logic. --- src/components/structures/MessagePanel.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js index 698b1073d0..cfa4735481 100644 --- a/src/components/structures/MessagePanel.js +++ b/src/components/structures/MessagePanel.js @@ -159,6 +159,7 @@ module.exports = React.createClass({ if (wantTile) { ret.push(this._getTilesForEvent(prevEvent, mxEv, last)); + prevEvent = mxEv; } else if (!mxEv.status) { // if we aren't showing the event, put in a dummy scroll token anyway, so // that we can scroll to the right place.