fix crash

insomniachi · May 12, 2023 · f1703bb · f1703bb
1 parent 0f69f4b
commit f1703bb
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/Totoro.Core/ViewModels/WatchViewModel.cs b/Totoro.Core/ViewModels/WatchViewModel.cs
@@ -361,7 +361,7 @@ public override async Task OnNavigatedTo(IReadOnlyDictionary<string, object> par
 
     public override async Task OnNavigatedFrom()
     {
-        MediaPlayer.Dispose();
+        MediaPlayer?.Dispose();
         NativeMethods.AllowSleep();
         if (_videoStreamResolver is IAsyncDisposable ad)
         {
@@ -497,9 +497,13 @@ private async Task TrySetAnime(string url, string title)
             return;
         }
 
-        _anime = await _animeService.GetInformation(id.Value);
-        _episodeMetadata = await _myAnimeListService.GetEpisodes(id.Value);
-        SetAnime(_anime);
+        _animeService.GetInformation(id.Value)
+            .Subscribe(async anime =>
+            {
+                _anime = anime;
+                _episodeMetadata = await _myAnimeListService.GetEpisodes(id.Value);
+                SetAnime(_anime);
+            }, RxApp.DefaultExceptionHandler.OnError);
     }
 
     private async Task TrySetAnime(string title)
@@ -512,9 +516,13 @@ private async Task TrySetAnime(string title)
             return;
         }
 
-        _anime = await _animeService.GetInformation(id.Value);
-        _episodeMetadata = await _myAnimeListService.GetEpisodes(id.Value);
-        SetAnime(_anime);
+        _animeService.GetInformation(id.Value)
+            .Subscribe(async anime =>
+            {
+                _anime = anime;
+                _episodeMetadata = await _myAnimeListService.GetEpisodes(id.Value);
+                SetAnime(_anime);
+            }, RxApp.DefaultExceptionHandler.OnError);
     }
 
     private async Task<long?> TryGetId(string title)