fixed issue with restoring wrong platform specific variables in backup
This commit is contained in:
parent
d3715d00ae
commit
1e4ce5c53c
1 changed files with 10 additions and 0 deletions
|
@ -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<LanguageSettings::AvailableLanguageEnum>(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"));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue