fix(wasm): Image/AcrylicBrush.AssignAndObserveBrush exception

unoplatform · Sep 22, 2021 · 73df35b · 73df35b
1 parent 235b2d7
commit 73df35b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs b/src/Uno.UI/UI/Xaml/Controls/TextBlock/TextBlock.cs
@@ -422,8 +422,12 @@ void refreshForeground()
 #endif
 			}
 
-			_foregroundChanged.Disposable =
-				Brush.AssignAndObserveBrush(Foreground, c => refreshForeground(), refreshForeground);
+			_foregroundChanged.Disposable = null;
+			if (Foreground?.SupportsAssignAndObserveBrush ?? false)
+			{
+				_foregroundChanged.Disposable =
+					Brush.AssignAndObserveBrush(Foreground, c => refreshForeground(), refreshForeground);
+			}
 
 			refreshForeground();
 		}

diff --git a/src/Uno.UI/UI/Xaml/Shapes/Shape.cs b/src/Uno.UI/UI/Xaml/Shapes/Shape.cs
@@ -181,13 +181,17 @@ public DoubleCollection StrokeDashArray
 #if LEGACY_SHAPE_MEASURE
 		protected virtual void OnFillChanged(Brush newValue)
 		{
-			_brushChanged.Disposable = Brush.AssignAndObserveBrush(newValue, _ =>
+			_brushChanged.Disposable = null;
+			if (newValue?.SupportsAssignAndObserveBrush ?? false)
+			{
+				_brushChanged.Disposable = Brush.AssignAndObserveBrush(newValue, _ =>
 #if __WASM__
-				OnFillUpdatedPartial()
+					OnFillUpdatedPartial()
 #else
-				RefreshShape(true)
+					RefreshShape(true)
 #endif
-			);
+				);
+			}
 
 			OnFillUpdated(newValue);
 		}