Close check for updates request early

UnderminersTeam · Sep 16, 2024 · aea5ec5 · aea5ec5
1 parent b4c60d9
commit aea5ec5
Showing 1 changed file with 32 additions and 30 deletions.
diff --git a/UndertaleModTool/MainWindow.xaml.cs b/UndertaleModTool/MainWindow.xaml.cs
@@ -2889,49 +2889,51 @@ private async void MenuItem_CheckForUpdates_Click(object sender, RoutedEventArgs
             {
                 httpClient ??= new();
 
+                JsonNode jsonResponse;
+
                 using (var request = new HttpRequestMessage(HttpMethod.Get, "https://api.github.com/repos/UnderminersTeam/UndertaleModTool/releases/latest"))
                 {
                     request.Headers.Add("Accept", "application/vnd.github+json");
                     request.Headers.Add("X-GitHub-Api-Version", "2022-11-28");
                     request.Headers.Add("User-Agent", new Regex(@"Git:|[ (),/:;<=>?@[\]{}]").Replace(Version, ""));
 
-                    using (var response = await httpClient.SendAsync(request))
+                    using var response = await httpClient.SendAsync(request);
+
+                    if (response?.IsSuccessStatusCode != true)
                     {
-                        if (response?.IsSuccessStatusCode != true)
-                        {
-                            string errText = $"{(response is null ? "Check your internet connection." : $"HTTP error - {response.ReasonPhrase}.")}";
-                            loaderDialog.ShowError($"Failed to check for updates!\n{errText}");
-                            return;
-                        }
+                        string errText = $"{(response is null ? "Check your internet connection." : $"HTTP error - {response.ReasonPhrase}.")}";
+                        loaderDialog.ShowError($"Failed to check for updates!\n{errText}");
+                        return;
+                    }
 
-                        JsonNode j = await response.Content.ReadFromJsonAsync<JsonNode>();
-                        string latestVersion = (string)j["tag_name"];
-                        var latestDateTime = ((DateTime)j["published_at"]);
+                    jsonResponse = await response.Content.ReadFromJsonAsync<JsonNode>();
+                }
 
-                        // HACK: There has to be a better way of getting the date of the current version
-                        DateTime currentDateTime = File.GetLastWriteTimeUtc(Path.Combine(ExePath, "UndertaleModTool.exe"));
+                string latestVersion = (string)jsonResponse["tag_name"];
+                DateTime latestDateTime = ((DateTime)jsonResponse["published_at"]);
 
-                        if (latestVersion != Version /*&& latestDateTime > currentDateTime*/)
-                        {
-                            if (loaderDialog.ShowQuestion("A new version of UndertaleModTool is avaliable!" +
-                                "\n" +
-                                $"\nCurrent version: {Version} ({currentDateTime})" +
-                                $"\nLatest version: {latestVersion} ({latestDateTime})" +
-                                "\n" +
-                                "\nDo you want to download the latest version?") == MessageBoxResult.Yes)
-                            {
-                                OpenBrowser((string)j["html_url"]);
+                // HACK: There has to be a better way of getting the date of the current version
+                DateTime currentDateTime = File.GetLastWriteTimeUtc(Path.Combine(ExePath, "UndertaleModTool.exe"));
 
-                                // TODO: Find which of the assets to download
-                                // TODO: Auto update
-                            }
-                        }
-                        else
-                        {
-                            loaderDialog.ShowMessage("UndertaleModTool is up to date.");
-                        }
+                if (latestVersion != Version /*&& latestDateTime > currentDateTime*/)
+                {
+                    if (loaderDialog.ShowQuestion("A new version of UndertaleModTool is avaliable!" +
+                        "\n" +
+                        $"\nCurrent version: {Version} ({currentDateTime})" +
+                        $"\nLatest version: {latestVersion} ({latestDateTime})" +
+                        "\n" +
+                        "\nDo you want to download the latest version?") == MessageBoxResult.Yes)
+                    {
+                        OpenBrowser((string)jsonResponse["html_url"]);
+
+                        // TODO: Find which of the assets to download
+                        // TODO: Auto update
                     }
                 }
+                else
+                {
+                    loaderDialog.ShowMessage("UndertaleModTool is up to date.");
+                }
             }
             finally
             {