From c164814abd92a35364837073e504f31909be8e3d Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Mon, 27 Nov 2023 10:59:48 +0700 Subject: [PATCH 1/2] fixed default server setting after importing --- client/ui/qml/Pages2/PageSetupWizardViewConfig.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml index ac35651f..65a6f319 100644 --- a/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml +++ b/client/ui/qml/Pages2/PageSetupWizardViewConfig.qml @@ -24,7 +24,7 @@ PageType { } function onImportFinished() { - if (ConnectionController.isConnected) { + if (!ConnectionController.isConnected) { ServersModel.setDefaultServerIndex(ServersModel.getServersCount() - 1); } From 426ac49f6ff98b2562fa0b3ef154b106d2a27e60 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Mon, 27 Nov 2023 12:46:59 +0700 Subject: [PATCH 2/2] fixed "auto-connect" option --- client/amnezia_application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp index e3adf67a..240c6d35 100644 --- a/client/amnezia_application.cpp +++ b/client/amnezia_application.cpp @@ -354,7 +354,7 @@ void AmneziaApplication::initControllers() m_settingsController.reset(new SettingsController(m_serversModel, m_containersModel, m_languageModel, m_settings)); m_engine->rootContext()->setContextProperty("SettingsController", m_settingsController.get()); - if (m_settingsController->isAutoStartEnabled() && m_serversModel->getDefaultServerIndex() >= 0) { + if (m_settingsController->isAutoConnectEnabled() && m_serversModel->getDefaultServerIndex() >= 0) { QTimer::singleShot(1000, this, [this]() { m_connectionController->openConnection(); }); }