matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for beta updates even if not a beta

Browse Source 
The site has been updated to not send beta update information unless user is enrolled in beta updates
This commit is contained in:
jacob1 2016-03-13 23:35:29 -04:00
parent 15068552b5
commit 81c68c46b0
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/client/Client.cpp
View File

@ -808,19 +808,20 @@ bool Client::CheckUpdate(void *updateRequest, bool checkSession)
} }
#endif #endif
#ifdef BETA if (!updateAvailable)
Json::Value betaVersion = versions["Beta"];
int betaMajor = betaVersion["Major"].asInt();
int betaMinor = betaVersion["Minor"].asInt();
int betaBuild = betaVersion["Build"].asInt();
std::string betaFile = betaVersion["File"].asString();
std::string betaChangelog = betaVersion["Changelog"].asString();
if (betaMajor > SAVE_VERSION || (betaMinor > MINOR_VERSION && betaMajor == SAVE_VERSION) || betaBuild > BUILD_NUM)
{ {
updateAvailable = true; Json::Value betaVersion = versions["Beta"];
updateInfo = UpdateInfo(betaMajor, betaMinor, betaBuild, betaFile, betaChangelog, UpdateInfo::Beta); int betaMajor = betaVersion["Major"].asInt();
int betaMinor = betaVersion["Minor"].asInt();
int betaBuild = betaVersion["Build"].asInt();
std::string betaFile = betaVersion["File"].asString();
std::string betaChangelog = betaVersion["Changelog"].asString();
if (betaMajor > SAVE_VERSION || (betaMinor > MINOR_VERSION && betaMajor == SAVE_VERSION) || betaBuild > BUILD_NUM)
{
updateAvailable = true;
updateInfo = UpdateInfo(betaMajor, betaMinor, betaBuild, betaFile, betaChangelog, UpdateInfo::Beta);
}
} }
#endif
#ifdef SNAPSHOT #ifdef SNAPSHOT
Json::Value snapshotVersion = versions["Snapshot"]; Json::Value snapshotVersion = versions["Snapshot"];