piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

One settings to rule them all ! (#5449)

Browse Source
This commit is contained in:
3djc
2017-12-01 11:54:30 +01:00
committed by Bertrand Songis
parent bdf0983642
commit d90ac05d6e
7 changed files with 50 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/storage/appdata.cpp
+5 -6
View File
@@ -589,9 +589,8 @@ void AppData::init()
getset( _snapshotDir, "snapshotpath" ,"" );
getset( _updatesDir, "lastUpdatesDir" ,"" );
getset( _firmwareBranch, "firmwareBranch", BRANCH_RELEASE_STABLE);
getset( _companionBranch, "companionBranch", BRANCH_RELEASE_STABLE);
getset( _OpenTxBranch, "OpenTxBranch", BRANCH_RELEASE_STABLE);
appLogsDir_init();
enableBackup_init();
backupOnFlash_init();
@@ -698,7 +697,7 @@ bool AppData::findPreviousVersionSettings(QString * version)
if (!fromSettings)
return false;
return true;
return true;
}
bool AppData::importSettings(QString fromVersion)
@@ -707,7 +706,7 @@ bool AppData::importSettings(QString fromVersion)
QString fromCompany;
QString fromProduct;
upgradeFromVersion = "";
if (fromVersion == "2.1") {
@@ -724,7 +723,7 @@ bool AppData::importSettings(QString fromVersion)
}
else
return false;
upgradeFromVersion = fromVersion;
QSettings fromSettings(fromCompany, fromProduct);