Merge pull request #185 from Alia5/develop

Develop

GlosSIConfig/UIModel.cpp

@@ -501,12 +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 ||
+                 if (info.second.major > version::VERSION_MAJOR) {
-                        info.second.patch > version::VERSION_PATCH ||
+                     return true;
-                        info.second.revision > version::VERSION_REVISION ||
+                 }
-                        info.second.commits_since_last > (QString(version::VERSION_STR).count('-') == 2
+                 if (info.second.major == version::VERSION_MAJOR && info.second.minor > version::VERSION_MINOR) {
-                                                              ? QString(version::VERSION_STR).split("-")[1].toInt()
+                     return true;
-                                                              : 0);
+                 }
+                 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);
         }

GlosSIConfig/qml/GlobalConf.qml

@@ -127,4 +127,15 @@ Item {
             }
         }
     }
+
+	InfoDialog {
+        id: helpInfoDialog
+        titleText: qsTr("")
+        text: qsTr("")
+        extraButton: false
+        extraButtonText: qsTr("")
+        onConfirmedExtra: function(data) {
+        }
+    }
+
 }

GlosSIConfig/qml/main.qml

@@ -94,6 +94,9 @@ Window {
                 failedRestartingSteamDialog.confirmedParam = closeWindow;
                 failedRestartingSteamDialog.open();
             }
+        }
+        onConfirmedExtra: function () {
+		    window.close()
         }
 		buttonText: qsTr("Yes")
         extraButton: true

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