From 39db77b6c1691e4c75e4f526e40eec5da78f5686 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 2 Oct 2022 17:31:13 +0200 Subject: [PATCH 1/5] 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); } From 0e955c819a5747725d856c3c885551bd9b358f19 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 2 Oct 2022 20:22:14 +0200 Subject: [PATCH 2/5] GlosSITarget: Fix freeze if installed in a path that contains spaces --- GlosSITarget/AppLauncher.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GlosSITarget/AppLauncher.cpp b/GlosSITarget/AppLauncher.cpp index 771ab86..4ed9ec0 100644 --- a/GlosSITarget/AppLauncher.cpp +++ b/GlosSITarget/AppLauncher.cpp @@ -132,7 +132,8 @@ void AppLauncher::launchWatchdog() GetModuleFileNameA(GetModuleHandle(NULL), buff, MAX_PATH); const std::string glossipath(buff); // hack to start a TRULY detached process... - system(("start " + (glossipath.substr(0, 1 + glossipath.find_last_of(L'\\')) + "GlosSIWatchdog.exe")).data()); + const auto launchString = ("start /b cmd.exe /c \"" + (glossipath.substr(0, 1 + glossipath.find_last_of(L'\\')) + "GlosSIWatchdog.exe" + "\"")); + system(launchString.data()); } #ifdef _WIN32 From ea31571a5f7a6764bbd5d0c55d02e3052937e734 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 2 Oct 2022 21:19:15 +0200 Subject: [PATCH 3/5] Fix GlosSIConfig not closing when selecting to not restart Steam --- GlosSIConfig/qml/main.qml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GlosSIConfig/qml/main.qml b/GlosSIConfig/qml/main.qml index d9145ef..cfc7b38 100644 --- a/GlosSIConfig/qml/main.qml +++ b/GlosSIConfig/qml/main.qml @@ -94,6 +94,9 @@ Window { failedRestartingSteamDialog.confirmedParam = closeWindow; failedRestartingSteamDialog.open(); } + } + onConfirmedExtra: function () { + window.close() } buttonText: qsTr("Yes") extraButton: true From 11a34b50f734a3e62c1a88ca29ba13d8a6d921f7 Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sun, 2 Oct 2022 21:20:50 +0200 Subject: [PATCH 4/5] Fix missing help dialog in global settings --- GlosSIConfig/qml/GlobalConf.qml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/GlosSIConfig/qml/GlobalConf.qml b/GlosSIConfig/qml/GlobalConf.qml index 7d3a24e..989b7ca 100644 --- a/GlosSIConfig/qml/GlobalConf.qml +++ b/GlosSIConfig/qml/GlobalConf.qml @@ -127,4 +127,15 @@ Item { } } } + + InfoDialog { + id: helpInfoDialog + titleText: qsTr("") + text: qsTr("") + extraButton: false + extraButtonText: qsTr("") + onConfirmedExtra: function(data) { + } + } + } \ No newline at end of file From 8eb93e0d226dae96ae05b9169aece61cd8f962da Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Mon, 3 Oct 2022 10:53:11 +0200 Subject: [PATCH 5/5] GlosSIConfig: Refactor update check filter --- GlosSIConfig/UIModel.cpp | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/GlosSIConfig/UIModel.cpp b/GlosSIConfig/UIModel.cpp index a482a57..04e1371 100644 --- a/GlosSIConfig/UIModel.cpp +++ b/GlosSIConfig/UIModel.cpp @@ -501,18 +501,28 @@ 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.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) && - info.second.major >= version::VERSION_MAJOR && info.second.minor >= version::VERSION_MINOR && - info.second.patch >= version::VERSION_PATCH && info.second.revision >= version::VERSION_REVISION ); + if (info.second.major > version::VERSION_MAJOR) { + return true; + } + if (info.second.major == version::VERSION_MAJOR && info.second.minor > version::VERSION_MINOR) { + return true; + } + if (info.second.major == version::VERSION_MAJOR && info.second.minor == version::VERSION_MINOR && + info.second.patch > version::VERSION_PATCH) { + return true; + } + if (info.second.major == version::VERSION_MAJOR && info.second.minor == version::VERSION_MINOR && + info.second.patch == version::VERSION_PATCH && info.second.revision > version::VERSION_REVISION) { + return true; + } + if (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 + ? QString(version::VERSION_STR).split("-")[1].toInt() + : 0)) { + return true; + } + return false; }) | std::ranges::views::all) { new_versions.push_back(info); }