This commit is contained in:
DavidXanatos 2022-12-20 09:18:21 +01:00
parent d40f275807
commit f81130cf2e
2 changed files with 15 additions and 5 deletions

View File

@ -5,6 +5,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [1.6.2b / 5.61.2] - 2022-12-??
### Fixed
- fixed issue with update label when "version update" is set to "ignore"
## [1.6.2a / 5.61.2] - 2022-12-19
### Fixed

View File

@ -291,6 +291,8 @@ bool COnlineUpdater::HandleUpdate()
}
}
QString OnNewUpdate = theConf->GetString("Options/OnNewUpdate", "ignore");
bool bNewUpdate = false;
QVariantMap Update = m_UpdateData["update"].toMap();
QString UpdateStr = Update["version"].toString();
@ -301,7 +303,7 @@ bool COnlineUpdater::HandleUpdate()
if (bNewer || iUpdate > GetCurrentUpdate()) {
if (ScanUpdateFiles(Update) == eNone) // check if this update has already been applied
theConf->SetValue("Updater/CurrentUpdate", MakeVersionStr(Update)); // cache result
else
else if (OnNewUpdate != "ignore")
{
if(PendingUpdate.isEmpty())
PendingUpdate = UpdateStr;
@ -343,13 +345,10 @@ bool COnlineUpdater::HandleUpdate()
}
}
QString OnNewUpdate = theConf->GetString("Options/OnNewUpdate", "ignore");
bool bCanApplyUpdate = (m_CheckMode == eAuto && OnNewUpdate == "install");
if (bNewUpdate)
{
if (OnNewUpdate == "ignore")
bNewUpdate = false;
else if ((!bNewRelease || (bCanApplyUpdate && !bCanRunInstaller)))
if ((!bNewRelease || (bCanApplyUpdate && !bCanRunInstaller)))
{
bool bIsUpdateReady = false;
if (theConf->GetString("Updater/UpdateVersion") == MakeVersionStr(Update))