Correctly dispose manager upon application lifetime exit

2021-02-13 15:05:04 +01:00
parent ae7928cd07
commit 52330c8528
1 changed files with 12 additions and 0 deletions
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Platform;
 using DesktopNotifications.FreeDesktop;
 using DesktopNotifications.Windows;
@@ -47,6 +48,17 @@ namespace DesktopNotifications.Avalonia
            //TODO Any better way of doing this?
            manager.Initialize().GetAwaiter().GetResult();

+            builder.AfterSetup(b =>
+            {
+                if (b.Instance.ApplicationLifetime is IControlledApplicationLifetime lifetime)
+                {
+                    lifetime.Exit += (s, e) =>
+                    {
+                        manager.Dispose();
+                    };
+                }
+            });
+
            AvaloniaLocator.CurrentMutable.Bind<INotificationManager>().ToConstant(manager);

            return builder;