fixed bug when autostart setting was not saving innto backup file and not preserving after backup
This commit is contained in:
parent
4cab4ebf8d
commit
378c8b4170
1 changed files with 16 additions and 4 deletions
|
|
@ -126,7 +126,13 @@ void SettingsController::clearLogs()
|
||||||
|
|
||||||
void SettingsController::backupAppConfig(const QString &fileName)
|
void SettingsController::backupAppConfig(const QString &fileName)
|
||||||
{
|
{
|
||||||
SystemController::saveFile(fileName, m_settings->backupAppConfig());
|
QByteArray data = m_settings->backupAppConfig();
|
||||||
|
QJsonDocument doc = QJsonDocument::fromJson(data);
|
||||||
|
QJsonObject config = doc.object();
|
||||||
|
|
||||||
|
config["Conf/autoStart"] = Autostart::isAutostart();
|
||||||
|
|
||||||
|
SystemController::saveFile(fileName, QJsonDocument(config).toJson());
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsController::restoreAppConfig(const QString &fileName)
|
void SettingsController::restoreAppConfig(const QString &fileName)
|
||||||
|
|
@ -143,9 +149,15 @@ void SettingsController::restoreAppConfigFromData(const QByteArray &data)
|
||||||
QJsonObject newConfigData = QJsonDocument::fromJson(data).object();
|
QJsonObject newConfigData = QJsonDocument::fromJson(data).object();
|
||||||
|
|
||||||
#if defined(Q_OS_WINDOWS) || defined(Q_OS_LINUX) || defined(Q_OS_MACX)
|
#if defined(Q_OS_WINDOWS) || defined(Q_OS_LINUX) || defined(Q_OS_MACX)
|
||||||
QString valueStr = newConfigData.value("Conf/autoStart").toString().toLower();
|
bool autoStart = false;
|
||||||
bool autoStartEnabled = (valueStr == "true");
|
if (newConfigData.contains("Conf/autoStart")) {
|
||||||
toggleAutoStart(autoStartEnabled);
|
autoStart = newConfigData["Conf/autoStart"].toBool();
|
||||||
|
}
|
||||||
|
toggleAutoStart(autoStart);
|
||||||
|
|
||||||
|
//QString valueStr = newConfigData.value("Conf/autoStart").toString().toLower();
|
||||||
|
//bool autoStartEnabled = (valueStr == "true");
|
||||||
|
//toggleAutoStart(autoStartEnabled);
|
||||||
#endif
|
#endif
|
||||||
m_serversModel->resetModel();
|
m_serversModel->resetModel();
|
||||||
m_languageModel->changeLanguage(
|
m_languageModel->changeLanguage(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue