Fix for not shutting down on tray 'Exit'

ReadySetTarkov/App.xaml.cs

@@ -51,9 +51,7 @@ protected override void OnStartup(StartupEventArgs e)
 
     private void RegisterExitEvents()
     {
-        AppDomain.CurrentDomain.ProcessExit += (s, e) => Exiting();
         Current.Exit += (s, e) => Exiting();
-        Current.SessionEnding += (s, e) => Exiting();
     }
 
     private void Exiting()

ReadySetTarkov/ReadySetTarkovHostBuilderExtensions.cs

@@ -11,6 +11,7 @@
 using ReadySetTarkov.LogReader;
 using ReadySetTarkov.LogReader.Handlers.Application;
 using ReadySetTarkov.LogReader.Handlers.Application.LineHandlers;
+using ReadySetTarkov.Services;
 using ReadySetTarkov.Settings;
 using ReadySetTarkov.Tarkov;
 using ReadySetTarkov.Utility;
@@ -30,6 +31,7 @@ public static IHostBuilder AddServices(this IHostBuilder hostBuilder)
             _ = services.AddSingleton<ICoreService, Core>();
             _ = services.AddSingleton<IHostedService>(s => s.GetRequiredService<ICoreService>());
             _ = services.AddHostedService<GameEventHandler>();
+            _ = services.AddHostedService<ShutdownHandler>();
 
             _ = services.AddSingleton<Game>();
             _ = services.AddSingleton<ITarkovGame>(s => s.GetRequiredService<Game>());

ReadySetTarkov/Services/ShutdownHandler.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+
+using Microsoft.Extensions.Hosting;
+using Microsoft.VisualStudio.Threading;
+
+namespace ReadySetTarkov.Services;
+internal class ShutdownHandler : IHostedService
+{
+    private readonly JoinableTaskFactory _joinableTaskFactory;
+
+    public ShutdownHandler(IHostApplicationLifetime hostApplicationLifetime, JoinableTaskFactory joinableTaskFactory)
+    {
+        _joinableTaskFactory = joinableTaskFactory;
+
+        hostApplicationLifetime.ApplicationStopping.Register(static (c) => _ = (c as ShutdownHandler)!.ShutdownAppAsync(), this);
+    }
+
+    public Task StartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    private async Task ShutdownAppAsync()
+    {
+        await _joinableTaskFactory.SwitchToMainThreadAsync();
+
+        Application.Current.Shutdown();
+    }
+}