From 0da63062d774b571de2ee5759f63efe107a85f2b Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sat, 3 Dec 2022 15:23:52 +0300 Subject: [PATCH] bugfix: fixed transition to the "Installed services" page when importing a config that does not have installed containers --- client/ui/pages_logic/StartPageLogic.cpp | 8 -------- client/ui/pages_logic/ViewConfigLogic.cpp | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp index 1e28d6cd..306db93b 100644 --- a/client/ui/pages_logic/StartPageLogic.cpp +++ b/client/ui/pages_logic/StartPageLogic.cpp @@ -166,14 +166,6 @@ bool StartPageLogic::importConnection(const QJsonObject &profile) return false; } - if (!profile.contains(config_key::containers)) { - uiLogic()->selectedServerIndex = m_settings->defaultServerIndex(); - uiLogic()->selectedDockerContainer = m_settings->defaultContainer(uiLogic()->selectedServerIndex); - uiLogic()->onUpdateAllPages(); - - emit uiLogic()->goToPage(Page::ServerContainers); - } - return true; } diff --git a/client/ui/pages_logic/ViewConfigLogic.cpp b/client/ui/pages_logic/ViewConfigLogic.cpp index 17d8814e..1dfe9abe 100644 --- a/client/ui/pages_logic/ViewConfigLogic.cpp +++ b/client/ui/pages_logic/ViewConfigLogic.cpp @@ -61,7 +61,17 @@ void ViewConfigLogic::importConfig() m_settings->addServer(configJson()); m_settings->setDefaultServer(m_settings->serversCount() - 1); - emit uiLogic()->goToPage(Page::Vpn); - emit uiLogic()->setStartPage(Page::Vpn); + + if (!configJson().contains(config_key::containers) || configJson().value(config_key::containers).toArray().isEmpty()) { + uiLogic()->selectedServerIndex = m_settings->defaultServerIndex(); + uiLogic()->selectedDockerContainer = m_settings->defaultContainer(uiLogic()->selectedServerIndex); + uiLogic()->onUpdateAllPages(); + emit uiLogic()->goToPage(Page::Vpn); + emit uiLogic()->setStartPage(Page::Vpn); + emit uiLogic()->goToPage(Page::ServerContainers); + } else { + emit uiLogic()->goToPage(Page::Vpn); + emit uiLogic()->setStartPage(Page::Vpn); + } }