Merge branch 'rav/roomview_works' into rav/read_marker

2016-02-23 18:56:11 +00:00 · 2016-02-23 18:56:11 +00:00 · 4f417f7a82
parent 029f47d91c 68e0192acc
commit 4f417f7a82
1 changed files with 1 additions and 0 deletions
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@ -193,6 +193,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.