diff --git a/src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs b/src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs index 78005c148ec0..a71c7d30baa1 100644 --- a/src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs +++ b/src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs @@ -17,7 +17,6 @@ public MediaPreview(MediaPreviewViewModel model) ViewModel = model; InitializeComponent(); PlayerContext.Loaded += PlayerContext_Loaded; - PlayerContext.Unloaded += PlayerContext_Unloaded; Unloaded += MediaPreview_Unloaded; } @@ -30,12 +29,6 @@ private void PlayerContext_Loaded(object sender, RoutedEventArgs e) ViewModel.TogglePlaybackRequested += TogglePlaybackRequestInvoked; } - private void PlayerContext_Unloaded(object sender, RoutedEventArgs e) - { - PlayerContext.MediaPlayer.VolumeChanged -= MediaPlayer_VolumeChanged; - ViewModel.TogglePlaybackRequested -= TogglePlaybackRequestInvoked; - } - private void MediaPreview_Unloaded(object sender, RoutedEventArgs e) { // The MediaPlayerElement isn't properly disposed by Windows so we set the source to null @@ -43,8 +36,10 @@ private void MediaPreview_Unloaded(object sender, RoutedEventArgs e) PlayerContext.Source = null; PlayerContext.Loaded -= PlayerContext_Loaded; - PlayerContext.Unloaded -= PlayerContext_Unloaded; Unloaded -= MediaPreview_Unloaded; + + PlayerContext.MediaPlayer.VolumeChanged -= MediaPlayer_VolumeChanged; + ViewModel.TogglePlaybackRequested -= TogglePlaybackRequestInvoked; } private void MediaPlayer_VolumeChanged(MediaPlayer sender, object args)