From 39db77b6c1691e4c75e4f526e40eec5da78f5686 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 2 Oct 2022 17:31:13 +0200 Subject: [PATCH] Fix update notification informing about old snapshots MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No one's gonna know if I push this fast enough 😅🤦‍ --- GlosSIConfig/UIModel.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/GlosSIConfig/UIModel.cpp b/GlosSIConfig/UIModel.cpp index 63589a5..a482a57 100644 --- a/GlosSIConfig/UIModel.cpp +++ b/GlosSIConfig/UIModel.cpp @@ -501,12 +501,18 @@ void UIModel::onAvailFilesResponse(QNetworkReply* reply) versionSplits[3].toInt(), versionString.count('-') == 2 ? versionString.split("-")[1].toInt() : 0}}; }) | std::views::filter([](const auto& info) { - return info.second.major > version::VERSION_MAJOR || info.second.minor > version::VERSION_MINOR || - info.second.patch > version::VERSION_PATCH || - info.second.revision > version::VERSION_REVISION || - info.second.commits_since_last > (QString(version::VERSION_STR).count('-') == 2 + return info.second.major > version::VERSION_MAJOR || + (info.second.minor > version::VERSION_MINOR && info.second.major >= version::VERSION_MAJOR) || + (info.second.patch > version::VERSION_PATCH && info.second.major >= version::VERSION_MAJOR + && info.second.minor >= version::VERSION_MINOR) || + (info.second.revision > version::VERSION_REVISION && + info.second.major >= version::VERSION_MAJOR && info.second.minor >= version::VERSION_MINOR && + info.second.patch >= version::VERSION_PATCH) || + (info.second.commits_since_last > (QString(version::VERSION_STR).count('-') == 2 ? QString(version::VERSION_STR).split("-")[1].toInt() - : 0); + : 0) && + info.second.major >= version::VERSION_MAJOR && info.second.minor >= version::VERSION_MINOR && + info.second.patch >= version::VERSION_PATCH && info.second.revision >= version::VERSION_REVISION ); }) | std::ranges::views::all) { new_versions.push_back(info); }