From 3fcb40f9ddbf51d014e0f978d402b426ca3a3460 Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Sat, 19 Dec 2020 11:47:05 +0100
Subject: [PATCH] Fix invite page closing the wrong page

This fix #150
---
 imports/NeoChat/Page/InviteUserPage.qml | 6 ++----
 imports/NeoChat/Panel/RoomDrawer.qml    | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/imports/NeoChat/Page/InviteUserPage.qml b/imports/NeoChat/Page/InviteUserPage.qml
index cb3c9a131..07b195f19 100644
--- a/imports/NeoChat/Page/InviteUserPage.qml
+++ b/imports/NeoChat/Page/InviteUserPage.qml
@@ -15,15 +15,13 @@ Kirigami.ScrollablePage {
 
     property var room
 
-    parent: applicationWindow().overlay
-
     title: i18n("Invite a User")
 
     actions {
         main: Kirigami.Action {
             icon.name: "dialog-close"
             text: i18nc("@action", "Cancel")
-            onTriggered: applicationWindow().pageStack.pop()
+            onTriggered: applicationWindow().pageStack.layers.pop()
         }
     }
     header: RowLayout {
@@ -125,7 +123,7 @@ Kirigami.ScrollablePage {
 
                     onClicked: {
                         room.inviteToRoom(userID);
-                        applicationWindow().pageStack.pop();
+                        applicationWindow().pageStack.layers.pop();
                     }
                 }
             }
diff --git a/imports/NeoChat/Panel/RoomDrawer.qml b/imports/NeoChat/Panel/RoomDrawer.qml
index d7523b69b..252618fdb 100644
--- a/imports/NeoChat/Panel/RoomDrawer.qml
+++ b/imports/NeoChat/Panel/RoomDrawer.qml
@@ -48,7 +48,7 @@ Kirigami.OverlayDrawer {
                     icon.name: "list-add-user"
                     text: i18n("Invite")
                     onClicked: {
-                        applicationWindow().pageStack.push("qrc:/imports/NeoChat/Page/InviteUserPage.qml", {"room": room})
+                        applicationWindow().pageStack.layers.push("qrc:/imports/NeoChat/Page/InviteUserPage.qml", {"room": room})
                         roomDrawer.close();
                     }
                 }