Fix Dispose()

Author: Asteriskx

SagiriApp/Models/SagiriModel.cs

@@ -34,7 +34,7 @@ internal class SagiriModel : BindableBase, IDisposable
         private ISpotifyService _ISpotifyService { get; init; } = new SpotifyService();
         private IMisskeyService _IMisskeyService { get; init; } = new MisskeyService();
 
-        private Logger _Logger { get; init; } = Logger.GetInstance;
+        private Logger _Logger { get; set; } = Logger.GetInstance;
 
         private static Lazy<HttpClient> _Client { get; set; } = new();
         private CancellationTokenSource _CancellationSource { get; init; } = new();
@@ -65,9 +65,16 @@ internal SagiriModel() { }
 
         public void Dispose()
         {
+            _ISpotifyService?.Dispose();
+            _IMisskeyService?.Dispose();
+            
             CurrentTrackInfo.AddTo(_cd);
             IsSpotifyPlaying.AddTo(_cd);
+            PostingFormat.AddTo(_cd);
             _cd.Dispose();
+
+            _CancellationSource?.Dispose();
+            _Logger = null; 
         }
 
         #endregion Public Methods
@@ -258,7 +265,7 @@ private void _OnSpotifyCurrentTrackErrorDetected()
             MessageBox.Show("Spotify CurrentTrackError...", "Sagiri-NowPlaying Closed...");
             _Logger.WriteLog("Spotify CurrentTrackError...", Logger.LogLevel.Error);
 
-            _ISpotifyService.Dispose();
+            _ISpotifyService?.Dispose();
         }
 
         private void _NotifyErrorCredentialInfo(string errorType, string title, string message = "")

SagiriApp/ViewModel/SagiriViewModel.cs

@@ -49,7 +49,7 @@ internal SagiriViewModel()
 
             NowPlayingCommand = new AsyncReactiveCommand().WithSubscribe(async () => await _SagiriModel.PostMisskeyAsync()).AddTo(_cd);
             AlbumArtClickCommand.Subscribe(_ => SagiriModel.ViewAlbumArt()).AddTo(_cd);
-            SettingJsonSaveCommand.Subscribe(_ => _SagiriModel.SaveSetting());
+            SettingJsonSaveCommand.Subscribe(_ => _SagiriModel.SaveSetting()).AddTo(_cd);
         }
 
         public void Dispose() => _cd.Dispose();