From 202fec2a35b4cafd959f76c9b6be07d3937bf7f5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Tue, 10 Dec 2019 14:35:17 +0100
Subject: [PATCH] dont cancel on remote echo of own .request event

---
 src/crypto/verification/request/VerificationRequest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/crypto/verification/request/VerificationRequest.js b/src/crypto/verification/request/VerificationRequest.js
index 9b9fbb566..ba63a479f 100644
--- a/src/crypto/verification/request/VerificationRequest.js
+++ b/src/crypto/verification/request/VerificationRequest.js
@@ -296,7 +296,7 @@ export default class VerificationRequest extends EventEmitter {
             this._requestEvent = event;
             this._initiatedByMe = this._wasSentByMe(event);
             this._setPhase(PHASE_REQUESTED);
-        } else {
+        } else if (this._phase !== PHASE_REQUESTED) {
             logger.warn("Ignoring flagged verification request from " +
                 event.getSender());
             await this.cancel(errorFromEvent(newUnexpectedMessageError()));