Skip to content

Commit 7b4325a

Browse files
authored
Code Quality: Fixed an issue where the fix in #17335 didn't work (#17337)
1 parent 27d9db1 commit 7b4325a

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

src/Files.App/UserControls/FilePreviews/MediaPreview.xaml.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public MediaPreview(MediaPreviewViewModel model)
1717
ViewModel = model;
1818
InitializeComponent();
1919
PlayerContext.Loaded += PlayerContext_Loaded;
20-
PlayerContext.Unloaded += PlayerContext_Unloaded;
2120
Unloaded += MediaPreview_Unloaded;
2221
}
2322

@@ -30,21 +29,17 @@ private void PlayerContext_Loaded(object sender, RoutedEventArgs e)
3029
ViewModel.TogglePlaybackRequested += TogglePlaybackRequestInvoked;
3130
}
3231

33-
private void PlayerContext_Unloaded(object sender, RoutedEventArgs e)
34-
{
35-
PlayerContext.MediaPlayer.VolumeChanged -= MediaPlayer_VolumeChanged;
36-
ViewModel.TogglePlaybackRequested -= TogglePlaybackRequestInvoked;
37-
}
38-
3932
private void MediaPreview_Unloaded(object sender, RoutedEventArgs e)
4033
{
4134
// The MediaPlayerElement isn't properly disposed by Windows so we set the source to null
4235
// to avoid issues the next time the control is used.
4336
PlayerContext.Source = null;
4437

4538
PlayerContext.Loaded -= PlayerContext_Loaded;
46-
PlayerContext.Unloaded -= PlayerContext_Unloaded;
4739
Unloaded -= MediaPreview_Unloaded;
40+
41+
PlayerContext.MediaPlayer.VolumeChanged -= MediaPlayer_VolumeChanged;
42+
ViewModel.TogglePlaybackRequested -= TogglePlaybackRequestInvoked;
4843
}
4944

5045
private void MediaPlayer_VolumeChanged(MediaPlayer sender, object args)

0 commit comments

Comments
 (0)