From f81ee1b267148295e40d7fc3453e1bd74f8938c0 Mon Sep 17 00:00:00 2001 From: ronoaer Date: Tue, 12 Sep 2023 21:38:36 +0800 Subject: [PATCH] reconnect to server when changed the protocol and status is connected or connnecting --- .../ui/qml/Components/HomeContainersListView.qml | 14 ++++++++++++++ client/ui/qml/Pages2/PageHome.qml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml index f5d27c00e..e265574b7 100644 --- a/client/ui/qml/Components/HomeContainersListView.qml +++ b/client/ui/qml/Components/HomeContainersListView.qml @@ -62,8 +62,22 @@ ListView { onClicked: { if (checked) { isDefault = true + var needReconnected = false + if (menuContent.currentIndex !== index) { + needReconnected = true + } + menuContent.currentIndex = index containersDropDown.menuVisible = false + + + if (needReconnected && + (ConnectionController.isConnected || ConnectionController.isConnectionInProgress)) { + PageController.showNotificationMessage(qsTr("Reconnect via VPN Procotol: ") + name) + PageController.goToPageHome() + menu.visible = false + ConnectionController.openConnection() + } } else { ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index)) InstallController.setShouldCreateServer(false) diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml index 01ba3032c..b9bc23665 100644 --- a/client/ui/qml/Pages2/PageHome.qml +++ b/client/ui/qml/Pages2/PageHome.qml @@ -210,7 +210,7 @@ PageType { } Component.onCompleted: updateContainersModelFilters() - currentIndex: ContainersModel.getDefaultContainer() + currentIndex: ContainersModel.getDefaultContainer() - 1 } } }