From 1e4ce5c53c039c6b9c4f943310f3471ad11d4db4 Mon Sep 17 00:00:00 2001 From: Mitternacht822 Date: Thu, 12 Jun 2025 15:15:37 +0400 Subject: [PATCH] fixed issue with restoring wrong platform specific variables in backup --- client/ui/controllers/settingsController.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/client/ui/controllers/settingsController.cpp b/client/ui/controllers/settingsController.cpp index f8e97a1f..260ad3eb 100644 --- a/client/ui/controllers/settingsController.cpp +++ b/client/ui/controllers/settingsController.cpp @@ -131,6 +131,8 @@ void SettingsController::backupAppConfig(const QString &fileName) QJsonObject config = doc.object(); config["Conf/autoStart"] = Autostart::isAutostart(); + config["Conf/killSwitchEnabled"] = isKillSwitchEnabled(); + config["Conf/strictKillSwitchEnabled"] = isStrictKillSwitchEnabled(); SystemController::saveFile(fileName, QJsonDocument(config).toJson()); } @@ -155,6 +157,7 @@ void SettingsController::restoreAppConfigFromData(const QByteArray &data) } toggleAutoStart(autoStart); #endif + m_serversModel->resetModel(); m_languageModel->changeLanguage( static_cast(m_languageModel->getCurrentLanguageIndex())); @@ -170,6 +173,13 @@ void SettingsController::restoreAppConfigFromData(const QByteArray &data) m_sitesModel->setRouteMode(siteSplitTunnelingRouteMode); m_sitesModel->toggleSplitTunneling(siteSplittunnelingEnabled); +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) + m_settings->setAutoConnect(false); + m_settings->setStartMinimized(enable); + m_settings->setKillSwitchEnabled(false); + m_settings->setStrictKillSwitchEnabled(false); +#endif + emit restoreBackupFinished(); } else { emit changeSettingsErrorOccurred(tr("Backup file is corrupted"));