chore: Adjust for null invocation validation

unoplatform · Jun 12, 2024 · 95318ac · 95318ac
1 parent ea73475
commit 95318ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/DependencyObject/DependencyObjectGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/DependencyObject/DependencyObjectGenerator.cs
@@ -699,12 +699,8 @@ public DependencyObject TemplatedParent
 
 {protectedModifier} {virtualModifier} void OnTemplatedParentChanged(DependencyPropertyChangedEventArgs e)
 {{
-    // Attempt to work around a native fault
-	if (this != null)
-	{{
-		__Store.SetTemplatedParent(e.NewValue as FrameworkElement);
-		OnTemplatedParentChangedPartial(e);
-	}}
+	__Store.SetTemplatedParent(e.NewValue as FrameworkElement);
+	OnTemplatedParentChangedPartial(e);
 }}
 
 #endregion

diff --git a/src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs
@@ -834,6 +834,12 @@ public override CGRect Frame
 
 			set
 			{
+				if (this is null)
+				{
+					// Don't fail on null instance from native call
+					return;
+				}
+
 				base.Frame = value;
 
 				try