From 1cfd9d8fc72b085ba0d64a83e4bb2e1730dac008 Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sun, 23 Jul 2017 16:41:38 -0400 Subject: [PATCH] only display updates based on build number, not version number --- src/client/Client.cpp | 4 ++-- src/gui/game/GameView.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/Client.cpp b/src/client/Client.cpp index dc3cdb782..7669cf0c6 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -831,7 +831,7 @@ bool Client::CheckUpdate(void *updateRequest, bool checkSession) int stableBuild = stableVersion["Build"].asInt(); std::string stableFile = stableVersion["File"].asString(); std::string stableChangelog = stableVersion["Changelog"].asString(); - if (stableMajor > SAVE_VERSION || (stableMinor > MINOR_VERSION && stableMajor == SAVE_VERSION) || stableBuild > BUILD_NUM) + if (stableBuild > BUILD_NUM) { updateAvailable = true; updateInfo = UpdateInfo(stableMajor, stableMinor, stableBuild, stableFile, stableChangelog, UpdateInfo::Stable); @@ -846,7 +846,7 @@ bool Client::CheckUpdate(void *updateRequest, bool checkSession) 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) + if (betaBuild > BUILD_NUM) { updateAvailable = true; updateInfo = UpdateInfo(betaMajor, betaMinor, betaBuild, betaFile, betaChangelog, UpdateInfo::Beta); diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp index d0afd9baa..5b9d999df 100644 --- a/src/gui/game/GameView.cpp +++ b/src/gui/game/GameView.cpp @@ -1491,7 +1491,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool case 'a': if ((Client::Ref().GetAuthUser().UserElevation == User::ElevationModerator || Client::Ref().GetAuthUser().UserElevation == User::ElevationAdmin - || Client::Ref().GetAuthUser().Username == "Mrprocom") && ctrl) + || Client::Ref().GetAuthUser().Username == "Mrprocom") && ctrl) { std::string authorString = Client::Ref().GetAuthorInfo().toStyledString(); new InformationMessage("Save authorship info", authorString, true);