diff options
Diffstat (limited to 'rbutil/rbutilqt/base')
| -rw-r--r-- | rbutil/rbutilqt/base/serverinfo.cpp | 13 | ||||
| -rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 1 | ||||
| -rw-r--r-- | rbutil/rbutilqt/base/systeminfo.h | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/rbutil/rbutilqt/base/serverinfo.cpp b/rbutil/rbutilqt/base/serverinfo.cpp index 94c369af72..84aa89039d 100644 --- a/rbutil/rbutilqt/base/serverinfo.cpp +++ b/rbutil/rbutilqt/base/serverinfo.cpp @@ -85,22 +85,21 @@ QVariant ServerInfo::platformValue(enum ServerInfos info, QString platform) value = value.toStringList().at(0); break; case CurReleaseUrl: + case RelCandidateUrl: { QString version = value.toStringList().at(0); if(value.toStringList().size() > 1) value = value.toStringList().at(1); - else if(!version.isEmpty()) // if value is empty, return empty url. + else if(!version.isEmpty() && info == CurReleaseUrl) value = SystemInfo::value(SystemInfo::ReleaseUrl).toString() .replace("%MODEL%", platform) .replace("%RELVERSION%", version); + else if(!version.isEmpty() && info == RelCandidateUrl) + value = SystemInfo::value(SystemInfo::CandidateUrl).toString() + .replace("%MODEL%", platform) + .replace("%RELVERSION%", version); } break; - case RelCandidateUrl: - if(value.toStringList().size() > 1) - value = value.toStringList().at(1); - else - value.clear(); - break; case CurDevelUrl: value = SystemInfo::value(SystemInfo::BleedingUrl).toString() .replace("%MODEL%", platform); diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index d14c3f5436..dee69a2e1e 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp @@ -42,6 +42,7 @@ const static struct { { SystemInfo::Wolf3DUrl, "wolf3d_url" }, { SystemInfo::XWorldUrl, "xworld_url" }, { SystemInfo::ReleaseUrl, "release_url" }, + { SystemInfo::CandidateUrl, "rc_url" }, { SystemInfo::DailyUrl, "daily_url" }, { SystemInfo::BuildInfoUrl, "build_info_url" }, { SystemInfo::GenlangUrl, "genlang_url" }, diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index 52b50ec4d7..c4afe4b27d 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h @@ -50,6 +50,7 @@ class SystemInfo : public QObject Wolf3DUrl, XWorldUrl, ReleaseUrl, + CandidateUrl, ReleaseVoiceUrl, ReleaseFontUrl, BuildInfoUrl, |