Fixed application lockup when writing logs on close

Kaoticz · Dec 31, 2024 · 91a6ceb · 91a6ceb
1 parent 73da876
commit 91a6ceb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/NadekoHub/Features/AppWindow/Views/Windows/AppView.axaml.cs b/NadekoHub/Features/AppWindow/Views/Windows/AppView.axaml.cs
@@ -156,15 +156,24 @@ protected override void OnClosing(WindowClosingEventArgs eventArgs)
 
         base.OnClosing(eventArgs);
     }
-
+    
     /// <inheritdoc/>
-    protected override void OnClosed(EventArgs eventArgs)
+    protected override async void OnClosed(EventArgs eventArgs)
     {
-        // When the updater is closed, kill all bots and write their logs.
-        _botOrchestrator.StopAllBots();
-        _logWriter.FlushAllAsync(true).Wait();
-
-        base.OnClosed(eventArgs);
+        try
+        {
+            // When the updater is closed, kill all bots and write their logs.
+            _botOrchestrator.StopAllBots();
+            await _logWriter.FlushAllAsync(true);
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex);
+        }
+        finally
+        {
+            base.OnClosed(eventArgs);
+        }
     }
 
     /// <summary>
@@ -255,8 +264,7 @@ private async Task UpdateAndCloseAsync()
             return;
 
         _ = new UpdateView().ShowDialog(this);
-
-
+
         try
         {
             await _appResolver.InstallOrUpdateAsync(AppContext.BaseDirectory);
@@ -276,13 +284,13 @@ private async Task UpdateAndCloseAsync()
     [SupportedOSPlatform("windows")]
     private async Task MigrateOldBotsAsync()
     {
-        var configFileUri = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "NadekoBotUpdater", "bots.json");
+        var configFileUri = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "NadekoBotUpdater", "bots.json");
 
         if (File.Exists(AppStatics.AppConfigUri) || !File.Exists(configFileUri))
             return;
 
         var bots = (JsonSerializer.Deserialize<OldUpdaterBotEntry[]>(await File.ReadAllTextAsync(configFileUri)) ?? [])
-            .Where(x => !string.IsNullOrWhiteSpace(x.PathUri) && File.Exists(Path.Combine(x.PathUri, "NadekoBot.exe")))
+            .Where(x => !string.IsNullOrWhiteSpace(x.PathUri) && File.Exists(Path.Join(x.PathUri, "NadekoBot.exe")))
             .Select((x, y) => new BotEntry(x.Guid, new(x.Name, x.PathUri!, (uint)y, x.Version, x.IconUri)));
 
         foreach (var botEntry in bots)

diff --git a/NadekoHub/Features/Home/Services/AppResolver.cs b/NadekoHub/Features/Home/Services/AppResolver.cs
@@ -159,7 +159,7 @@ await GetDownloadUrlAsync(latestVersion, cToken),
                 }
             }
 
-            // Mark the new binary file as executable.
+            // Mark the new binary file as executable.c
             if (Environment.OSVersion.Platform is PlatformID.Unix)
             {
                 using var chmod = KotzUtilities.StartProcess("chmod", ["+x", BinaryUri]);