From 63659c960476c28acece2e7b0e5d5767eac84355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Mon, 28 Jun 2021 15:27:01 +0200
Subject: [PATCH] crypto: Fix verification requests getting cancelled

---
 matrix_sdk_crypto/src/verification/requests.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/matrix_sdk_crypto/src/verification/requests.rs b/matrix_sdk_crypto/src/verification/requests.rs
index ac3cbf8e..1db22561 100644
--- a/matrix_sdk_crypto/src/verification/requests.rs
+++ b/matrix_sdk_crypto/src/verification/requests.rs
@@ -436,7 +436,12 @@ impl VerificationRequest {
 
     pub(crate) fn receive_cancel(&self, sender: &UserId, content: &CancelContent<'_>) {
         if sender == self.other_user() {
-            let mut inner = self.inner.lock().unwrap().clone();
+            trace!(
+                sender = sender.as_str(),
+                code = content.cancel_code().as_str(),
+                "Cancelling a verification request, other user has cancelled"
+            );
+            let mut inner = self.inner.lock().unwrap();
             inner.cancel(false, content.cancel_code());
         }
     }
@@ -548,7 +553,7 @@ impl InnerRequest {
             InnerRequest::Passive(s) => s.clone().into_canceled(cancelled_by_us, cancel_code),
             InnerRequest::Done(_) => return,
             InnerRequest::Cancelled(_) => return,
-        })
+        });
     }
 
     async fn generate_qr_code(