fix(Program): Crash when stopping the application

Fixes SOUNDSWITCH-1
Belphemur · May 9, 2021 · 8da165d · 8da165d
1 parent 3e2fe17
commit 8da165d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/SoundSwitch/Model/AppModel.cs b/SoundSwitch/Model/AppModel.cs
@@ -480,5 +480,12 @@ public NoDevicesException() : base("No devices to select")
         }
 
         #endregion
+
+        public void Dispose()
+        {
+            TrayIcon?.Dispose();
+            ActiveAudioDeviceLister?.Dispose();
+            ActiveUnpluggedAudioLister?.Dispose();
+        }
     }
 }
diff --git a/SoundSwitch/Model/IAppModel.cs b/SoundSwitch/Model/IAppModel.cs
@@ -27,7 +27,7 @@
 
 namespace SoundSwitch.Model
 {
-    public interface IAppModel
+    public interface IAppModel : IDisposable
     {
         #region Properties
 

diff --git a/SoundSwitch/Program.cs b/SoundSwitch/Program.cs
@@ -129,11 +129,9 @@ private static void Main()
                 HandleException(ex);
             }
 #endif
-            AppModel.Instance.ActiveAudioDeviceLister.Dispose();
-            AppModel.Instance.ActiveUnpluggedAudioLister.Dispose();
-            AppModel.Instance.TrayIcon.Dispose();
+            AppModel.Instance.Dispose();
             WindowsAPIAdapter.Stop();
-            MMNotificationClient.Instance.Dispose();
+            MMNotificationClient.Instance?.Dispose();
             Log.CloseAndFlush();
         }