Fix crash removing items in ListView (#7411)

dotnet · May 23, 2022 · 4b64fd9 · 4b64fd9
1 parent ba97726
commit 4b64fd9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Core/src/Handlers/Layout/LayoutHandler.Android.cs b/src/Core/src/Handlers/Layout/LayoutHandler.Android.cs
@@ -40,7 +40,7 @@ public override void SetVirtualView(IView view)
 
 			foreach (var child in VirtualView.OrderByZIndex())
 			{
-				PlatformView.AddView(child.ToPlatform(MauiContext));
+				PlatformView.SafelyAddView(child.ToPlatform(MauiContext));
 			}
 		}
 

diff --git a/src/Core/src/Platform/Android/ViewGroupExtensions.cs b/src/Core/src/Platform/Android/ViewGroupExtensions.cs
@@ -6,6 +6,14 @@ namespace Microsoft.Maui.Platform
 {
 	public static class ViewGroupExtensions
 	{
+		public static void SafelyAddView(this AViewGroup viewGroup, AView child)
+		{
+			if (child.Parent != null)
+				child.RemoveFromParent();
+
+			viewGroup.AddView(child);
+		}
+
 		public static IEnumerable<T> GetChildrenOfType<T>(this AViewGroup viewGroup) where T : AView
 		{
 			for (var i = 0; i < viewGroup.ChildCount; i++)