0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-942 fix vanilla version list

Browse Source 
Latest release gets the star
Latest snapshot, if it's newer than latest release gets the bug
This commit is contained in:
Petr Mrázek
2015-05-06 09:00:21 +02:00
parent 9598f80335
commit 2a4647125d
4 changed files with 72 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
logic/BaseVersionList.h
View File

@@ -46,6 +46,7 @@ public:
VersionIdRole,
ParentGameVersionRole,
RecommendedRole,
LatestRole,
TypeRole,
BranchRole,
PathRole,

26
logic/minecraft/MinecraftVersionList.cpp
View File

@@ -364,7 +364,21 @@ QVariant MinecraftVersionList::data(const QModelIndex& index, int role) const
return version->descriptor();
case RecommendedRole:
return version->descriptor() == g_VersionFilterData.recommendedMinecraftVersion;
return version->descriptor() == m_latestReleaseID;
case LatestRole:
{
if(version->descriptor() != m_latestSnapshotID)
return false;
MinecraftVersionPtr latestRelease = std::dynamic_pointer_cast<MinecraftVersion>(getLatestStable());
/*
if(latestRelease && latestRelease->m_releaseTime > version->m_releaseTime)
{
return false;
}
*/
return true;
}
case TypeRole:
return version->typeString();
@@ -376,7 +390,7 @@ QVariant MinecraftVersionList::data(const QModelIndex& index, int role) const
BaseVersionList::RoleList MinecraftVersionList::providesRoles()
{
return {VersionPointerRole, VersionRole, VersionIdRole, RecommendedRole, TypeRole};
return {VersionPointerRole, VersionRole, VersionIdRole, RecommendedRole, LatestRole, TypeRole};
}
BaseVersionPtr MinecraftVersionList::getLatestStable() const
@@ -388,14 +402,6 @@ BaseVersionPtr MinecraftVersionList::getLatestStable() const
BaseVersionPtr MinecraftVersionList::getRecommended() const
{
for(auto item: m_vlist)
{
auto version = std::dynamic_pointer_cast<MinecraftVersion>(item);
if(version->descriptor() == g_VersionFilterData.recommendedMinecraftVersion)
{
return item;
}
}
return getLatestStable();
}