From ad48d2997e3d7740c6c61e4fcce7b64c96349568 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 15 May 2019 14:54:52 +0100
Subject: [PATCH] prevent earlier replacements from messing things up

---
 src/models/event.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/models/event.js b/src/models/event.js
index 6949674cb..41ddbc12c 100644
--- a/src/models/event.js
+++ b/src/models/event.js
@@ -758,6 +758,10 @@ utils.extend(module.exports.MatrixEvent.prototype, {
         if (this.isRedacted()) {
             return;
         }
+        // ignore previous replacements
+        if (this._replacingEvent && this._replacingEvent.getTs() > newEvent.getTs()) {
+            return;
+        }
         if (newEvent.isBeingDecrypted()) {
             throw new Error("Trying to replace event when " +
                 "new content hasn't been decrypted yet");