From 38360b101a2d6fc6ffacecc675b37b658383526b Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Thu, 15 Oct 2020 20:34:48 -0400
Subject: [PATCH] Fix JoinRoom cancel button not going to last page

---
 src/gui/Pages/AddChat/CreateRoom.qml | 1 +
 src/gui/Pages/AddChat/DirectChat.qml | 3 ++-
 src/gui/Pages/AddChat/JoinRoom.qml   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gui/Pages/AddChat/CreateRoom.qml b/src/gui/Pages/AddChat/CreateRoom.qml
index 6969928a..69511fc2 100644
--- a/src/gui/Pages/AddChat/CreateRoom.qml
+++ b/src/gui/Pages/AddChat/CreateRoom.qml
@@ -45,6 +45,7 @@ HFlickableColumnPage {
         publicCheckBox.reset()
         encryptCheckBox.reset()
         blockOtherServersCheckBox.reset()
+        errorMessage.text = ""
 
         pageLoader.showPrevious()
     }
diff --git a/src/gui/Pages/AddChat/DirectChat.qml b/src/gui/Pages/AddChat/DirectChat.qml
index 777bc146..b7b0446c 100644
--- a/src/gui/Pages/AddChat/DirectChat.qml
+++ b/src/gui/Pages/AddChat/DirectChat.qml
@@ -75,8 +75,9 @@ HFlickableColumnPage {
 
         CancelButton {
             onClicked: {
-                userField.item.text = ""
+                userField.item.reset()
                 errorMessage.text   = ""
+
                 pageLoader.showPrevious()
             }
         }
diff --git a/src/gui/Pages/AddChat/JoinRoom.qml b/src/gui/Pages/AddChat/JoinRoom.qml
index 045d186b..1b03486a 100644
--- a/src/gui/Pages/AddChat/JoinRoom.qml
+++ b/src/gui/Pages/AddChat/JoinRoom.qml
@@ -49,7 +49,7 @@ HFlickableColumnPage {
 
     function cancel() {
         roomField.item.reset()
-        errorMessage.reset()
+        errorMessage.text = ""
 
         pageLoader.showPrevious()
     }