From 2a5e20dc6ff331b42d5dce99ee45ce19c5b60b56 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 10 Feb 2021 18:00:52 +0100
Subject: [PATCH] Fix cancel edit order on Escape key

---
 resources/qml/MessageView.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 09dc4e36..13b4c82c 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -50,10 +50,10 @@ ListView {
     Shortcut {
         sequence: StandardKey.Cancel
         onActivated: {
-            if (chat.model.edit)
-                chat.model.edit = undefined;
-            else
+            if (chat.model.reply)
                 chat.model.reply = undefined;
+            else
+                chat.model.edit = undefined;
         }
     }