Unset MediaPlayer from MediaPlayerElement when exiting now playing

Rise-Software · Jun 28, 2023 · 1dc6882 · 1dc6882
1 parent d83b210
commit 1dc6882
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/Rise Media Player Dev/Windows/CompactNowPlayingPage.xaml b/Rise Media Player Dev/Windows/CompactNowPlayingPage.xaml
@@ -16,6 +16,7 @@
     PointerCanceled="OnPointerExited"
     PointerEntered="OnPointerEntered"
     PointerExited="OnPointerExited"
+    Unloaded="OnPageUnloaded"
     mc:Ignorable="d">
 
     <Page.Resources>

diff --git a/Rise Media Player Dev/Windows/CompactNowPlayingPage.xaml.cs b/Rise Media Player Dev/Windows/CompactNowPlayingPage.xaml.cs
@@ -30,6 +30,11 @@ private void OnPlayerLoaded(object sender, RoutedEventArgs e)
             MainPlayer.SetMediaPlayer(MPViewModel.Player);
         }
 
+        private void OnPageUnloaded(object sender, RoutedEventArgs e)
+        {
+            MainPlayer.SetMediaPlayer(null);
+        }
+
         public static async Task NavigateAsync(Frame frame)
         {
             _ = await ApplicationView.GetForCurrentView().

diff --git a/Rise Media Player Dev/Windows/NowPlayingPage.xaml.cs b/Rise Media Player Dev/Windows/NowPlayingPage.xaml.cs
@@ -117,6 +117,8 @@ private void OnPageUnloaded(object sender, RoutedEventArgs e)
             PlayerControlsQueueWatcher?.Dispose();
 
             Bindings.StopTracking();
+
+            MainPlayer.SetMediaPlayer(null);
         }
 
         protected override void OnNavigatedTo(NavigationEventArgs e)