fix shutdown behaviour

Thomseeen · May 25, 2022 · 10c874a · 10c874a
1 parent 358c333
commit 10c874a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/Thomsen.SoundProfiler2/Mvvm/BaseViewModel.cs b/src/Thomsen.SoundProfiler2/Mvvm/BaseViewModel.cs
@@ -47,12 +47,14 @@ public void Show() {
         }
 
         public bool? ShowDialog() {
-            if (_view is null) {
-                _view = new T {
-                    DataContext = this
-                };
+            if (_view is not null) {
+                throw new InvalidOperationException("ShowDialog can only be called once.");
             }
 
+            _view = new T {
+                DataContext = this
+            };
+
             _view.Loaded += View_Loaded;
 
             return _view.ShowDialog();

diff --git a/src/Thomsen.SoundProfiler2/VersionAutoIncrement.tt b/src/Thomsen.SoundProfiler2/VersionAutoIncrement.tt
@@ -7,8 +7,8 @@ using System.Reflection;
 
 <#+
 
- int major = 0;
- int minor = 5;
+ int major = 1;
+ int minor = 0;
 
  static DateTime projectStartedDate = new DateTime(year: 2021, month: 8, day: 27);
 

diff --git a/src/Thomsen.SoundProfiler2/ViewModels/MainViewModel.cs b/src/Thomsen.SoundProfiler2/ViewModels/MainViewModel.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Timers;
 using System.Windows;
@@ -29,7 +30,8 @@ public class MainViewModel : BaseViewModel<MainView> {
 
         #region Private Fields
         private bool _disposed = false;
-        private readonly Timer _refreshTimer = new(500);
+        private bool _shutingDown = false;
+        private readonly System.Timers.Timer _refreshTimer = new(500);
 
         private readonly object _mixerApplicationsLock = new();
         private readonly object _mappingsLock = new();
@@ -185,6 +187,12 @@ private async void RefreshAsync() {
                 await Task.Run(() => {
                     /* Lock so multiple firing events don't overwrite each other, causing duplicate entries */
                     lock (_mixerApplicationsLock) {
+
+                        /* Don't do anything if we are shutting down */
+                        if (_shutingDown) {
+                            return;
+                        }
+
                         /* Filter apps by hidden mapping */
                         MixerApplicationModel[] newApps = FilterMixerApps(CoreAudioHandler.GetMixerApplications());
 
@@ -449,6 +457,9 @@ private void MixerApplication_PropertyChanged(object? sender, PropertyChangedEve
 
         #region BaseViewModel
         protected override void Dispose(bool disposing) {
+            _shutingDown = true;
+            Thread.Sleep(100);
+
             if (!_disposed) {
                 if (disposing) {
                     _refreshTimer.Stop();