From 5602b94dcbb5b73478b2f09900b4659598dea34c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 12 Jun 2019 10:22:39 +0200
Subject: [PATCH] make sure where not re-adding cancelled events when undoing
 local red.

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

diff --git a/src/models/room.js b/src/models/room.js
index 46ee612c0..02d999cea 100644
--- a/src/models/room.js
+++ b/src/models/room.js
@@ -1356,7 +1356,10 @@ Room.prototype._revertRedactionLocalEcho = function(redactionEvent) {
         // re-render after undoing redaction
         this.emit("Room.redactionCancelled", redactionEvent, this);
         // reapply relation now redaction failed
-        if (redactedEvent.isRelation()) {
+        if (
+            redactedEvent.isRelation() &&
+            redactedEvent.status !== EventStatus.CANCELLED
+        ) {
             this._aggregateNonLiveRelation(redactedEvent);
         }
     }