diff --git a/companion/src/updates/updateinterface.cpp b/companion/src/updates/updateinterface.cpp index 66c8f909e..f6dbe201b 100644 --- a/companion/src/updates/updateinterface.cpp +++ b/companion/src/updates/updateinterface.cpp @@ -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)