1.6.0
This commit is contained in:
parent
4a3e6f473d
commit
3439e896d8
|
@ -290,7 +290,7 @@ bool COnlineUpdater::HandleUpdate()
|
|||
bool bNewer;
|
||||
if ((bNewer = IsVersionNewer(UpdateStr)) || UpdateStr == GetCurrentVersion()) {
|
||||
int iUpdate = Update["update"].toInt();
|
||||
if (iUpdate) UpdateStr += QString('a' + (iUpdate - 1));
|
||||
if (iUpdate) UpdateStr += QChar('a' + (iUpdate - 1));
|
||||
if (bNewer || iUpdate > GetCurrentUpdate()) {
|
||||
if (ScanUpdateFiles(Update) == eNone) // check if this update has already been applied
|
||||
theConf->SetValue("Updater/CurrentUpdate", MakeVersionStr(Update)); // cache result
|
||||
|
@ -871,7 +871,7 @@ QString COnlineUpdater::MakeVersionStr(const QVariantMap& Data)
|
|||
{
|
||||
QString Str = Data["version"].toString();
|
||||
int iUpdate = Data["update"].toInt();
|
||||
if (iUpdate) Str += QString('a' + (iUpdate - 1));
|
||||
if (iUpdate) Str += QChar('a' + (iUpdate - 1));
|
||||
return Str;
|
||||
}
|
||||
|
||||
|
|
|
@ -2925,7 +2925,7 @@ QString CSandMan::GetVersion()
|
|||
+ "." + QString::number(VERSION_REV)
|
||||
//#endif
|
||||
#if VERSION_UPD > 0
|
||||
+ QString('a' + VERSION_UPD - 1)
|
||||
+ QChar('a' + VERSION_UPD - 1)
|
||||
#endif
|
||||
;
|
||||
return Version;
|
||||
|
|
|
@ -1361,7 +1361,7 @@ QString CSettingsWindow__MkVersion(const QString& Name, const QVariantMap& Relea
|
|||
QString Version = Release.value("version").toString();
|
||||
//if (Release["build"].type() != QVariant::Invalid)
|
||||
int iUpdate = Release["iUpdate"].toInt();
|
||||
if(iUpdate) Version += 'a' + (iUpdate - 1);
|
||||
if(iUpdate) Version += QChar('a' + (iUpdate - 1));
|
||||
return QString("<a href=\"%1\">%2</a>").arg(Name, Version);
|
||||
}
|
||||
|
||||
|
@ -1373,7 +1373,7 @@ void CSettingsWindow::OnUpdateData(const QVariantMap& Data, const QVariantMap& P
|
|||
QString Version = QString::number(VERSION_MJR) + "." + QString::number(VERSION_MIN) + "." + QString::number(VERSION_REV);
|
||||
int iUpdate = COnlineUpdater::GetCurrentUpdate();
|
||||
if(iUpdate)
|
||||
Version += QString('a' + (iUpdate - 1));
|
||||
Version += QChar('a' + (iUpdate - 1));
|
||||
|
||||
m_UpdateData = Data;
|
||||
QVariantMap Releases = m_UpdateData["releases"].toMap();
|
||||
|
|
Loading…
Reference in New Issue