summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/base/serverinfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/base/serverinfo.cpp')
-rw-r--r--rbutil/rbutilqt/base/serverinfo.cpp13
1 files changed, 6 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);