Skip to content

Code Quality: Fixed an issue where the fix in #17335 didn't work #17337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2025
Merged

Code Quality: Fixed an issue where the fix in #17335 didn't work #17337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ public MediaPreview(MediaPreviewViewModel model)
ViewModel = model;
InitializeComponent();
PlayerContext.Loaded += PlayerContext_Loaded;
PlayerContext.Unloaded += PlayerContext_Unloaded;
Unloaded += MediaPreview_Unloaded;
}

Expand All @@ -30,21 +29,17 @@ 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
// to avoid issues the next time the control is used.
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)
Expand Down
Loading