Merge branch 'main' into FixWindowsMediaSourceDisposalBug

ne0rrmatrix · web-flow · commit c8f9e18a34bc · 2025-05-06T22:46:02.000-07:00
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementPage.xaml.cs
@@ -250,6 +250,7 @@ void DisplayPopup(object sender, EventArgs e)
 		{
 			AndroidViewType = AndroidViewType.SurfaceView,
 			Source = MediaSource.FromResource("AppleVideo.mp4"),
+			MetadataArtworkUrl = botImageUrl,
 			HeightRequest = 600,
 			WidthRequest = 600,
 			ShouldAutoPlay = true,
@@ -272,7 +273,6 @@ void DisplayPopup(object sender, EventArgs e)
 		popup.Closed += (s, e) =>
 		{
 			popupMediaElement.Stop();
-			popupMediaElement.Handler?.DisconnectHandler();
 		};
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,7 @@ void DisplayPopup(object sender, EventArgs e)`
`250`	`250`	`{`
`251`	`251`	`AndroidViewType = AndroidViewType.SurfaceView,`
`252`	`252`	`Source = MediaSource.FromResource("AppleVideo.mp4"),`
	`253`	`+ MetadataArtworkUrl = botImageUrl,`
`253`	`254`	`HeightRequest = 600,`
`254`	`255`	`WidthRequest = 600,`
`255`	`256`	`ShouldAutoPlay = true,`
`@@ -272,7 +273,6 @@ void DisplayPopup(object sender, EventArgs e)`
`272`	`273`	`popup.Closed += (s, e) =>`
`273`	`274`	`{`
`274`	`275`	`popupMediaElement.Stop();`
`275`		`- popupMediaElement.Handler?.DisconnectHandler();`
`276`	`276`	`};`
`277`	`277`	`}`
`278`	`278`	`}`