From b0e3c6d65ab914934e66c46ae1a53388b22125c0 Mon Sep 17 00:00:00 2001
From: Rohit Sutradhar <rohitsutradhar311@gmail.com>
Date: Sat, 18 Jun 2022 01:38:29 +0530
Subject: [PATCH] Added escape handler for uploads (#1100)

* Added escape handler for uploads

* Update MessageView.qml

Changed if-else conditions to handle only one escape at a time
---
 resources/qml/MessageView.qml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 541d20db..ef11f886 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -192,10 +192,12 @@ Item {
         Shortcut {
             sequence: StandardKey.Cancel
             onActivated: {
-                if (chat.model.reply)
-                chat.model.reply = undefined;
+                if(room.input.uploads.length > 0)
+                    room.input.declineUploads();
+                else if(chat.model.reply)
+                    chat.model.reply = undefined;
                 else
-                chat.model.edit = undefined;
+                    chat.model.edit = undefined;
             }
         }