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

Split housekeeping tasks

Browse Source
This commit is contained in:
elecpower
2022-09-06 09:29:41 +10:00
committed by Peter Feerick
parent 38749d713d
commit 1d91d289a7
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/updates/updateinterface.cpp
+9 -8
View File
@@ -216,8 +216,9 @@ bool UpdateInterface::update()
return false;
}
if ((runParams->data.flags & UPDFLG_Housekeeping) && !housekeeping()) {
reportProgress(tr("%1 housekeeping failed").arg(name), QtCriticalMsg);
// perform before async install in case Companion restarted
if (!saveReleaseSettings()) {
reportProgress(tr("Failed to save release settings"), QtDebugMsg);
return false;
}
@@ -226,6 +227,11 @@ bool UpdateInterface::update()
return false;
}
if ((runParams->data.flags & UPDFLG_Housekeeping) && !housekeeping()) {
reportProgress(tr("%1 housekeeping failed").arg(name), QtCriticalMsg);
return false;
}
reportProgress(tr("%1 update successful").arg(name), QtInfoMsg);
if (!progress)
@@ -1311,12 +1317,7 @@ bool UpdateInterface::housekeeping()
if (progress) {
progress->setValue(cnt);
progress->setMaximum(3);
}
if (!saveReleaseSettings()) {
reportProgress(tr("Failed to save release settings"), QtDebugMsg);
return false;
progress->setMaximum(2);
}
if (progress)