diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml index cc49e4f0b..222f7764c 100644 --- a/client/ui/qml/Pages2/PageHome.qml +++ b/client/ui/qml/Pages2/PageHome.qml @@ -32,7 +32,7 @@ PageType { function onRestorePageHomeState(isContainerInstalled) { buttonContent.state = "expanded" if (isContainerInstalled) { - containersDropDown.menuVisible = true + containersDropDown.rootButtonClickedFunction() } } function onForceCloseDrawer() { diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml index a223f646e..c82ce855e 100644 --- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml +++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml @@ -28,17 +28,11 @@ PageType { ContainersModel.setDefaultContainer(ContainersModel.getCurrentlyProcessedContainerIndex()) } - PageController.goToStartPage() + PageController.closePage() // close installing page + PageController.closePage() // close protocol settings page + if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) { PageController.restorePageHomeState(true) - } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) { - PageController.goToPage(PageEnum.PageSettingsServersList, false) - PageController.goToPage(PageEnum.PageSettingsServerInfo, false) - if (isServiceInstall) { - PageController.goToPageSettingsServerServices() - } - } else { - PageController.goToPage(PageEnum.PageHome) } PageController.showNotificationMessage(finishedMessage)