diff options
| -rw-r--r-- | qml/AccountsPage.qml | 4 | ||||
| -rw-r--r-- | qml/ChatlistPage.qml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qml/AccountsPage.qml b/qml/AccountsPage.qml index a186989..b48a4e4 100644 --- a/qml/AccountsPage.qml +++ b/qml/AccountsPage.qml @@ -110,9 +110,9 @@ Kirigami.Page { dcAccounts.selectAccount(model.number) let context = dcAccounts.getSelectedAccount() if (context.isConfigured()) { - pageStack.push("qrc:/qml/ChatlistPage.qml", {context: context}) + pageStack.replace("qrc:/qml/ChatlistPage.qml", {context: context}) } else { - pageStack.push("qrc:/qml/ConfigurePage.qml", {context: context}) + pageStack.replace("qrc:/qml/ConfigurePage.qml", {context: context}) } } } diff --git a/qml/ChatlistPage.qml b/qml/ChatlistPage.qml index c77bbba..ce81602 100644 --- a/qml/ChatlistPage.qml +++ b/qml/ChatlistPage.qml @@ -97,10 +97,10 @@ Kirigami.Page { let chatPageComponent = Qt.createComponent("qrc:/qml/ChatPage.qml") if (chatPageComponent.status == Component.Ready) { let myPage = chatPageComponent.createObject(chatlistPage, {chatId: chatId}) - if (pageStack.depth == 2) { + if (pageStack.depth == 1) { pageStack.push(myPage) - } else if (pageStack.depth == 3) { - pageStack.currentIndex = 2 + } else if (pageStack.depth == 2) { + pageStack.currentIndex = 1 pageStack.replace(myPage) } } else if (chatPageComponent.status == Component.Error) { |