fix: XamlRoot may be null when the SKXamlCanvas is unloaded (#2854)

* fix: XamlRoot may be null when the SKXamlCanvas is unloaded * chore: Adjust more xamlroot uses --------- Co-authored-by: Matthew Leibowitz <[email protected]>
mono · Jun 3, 2024 · 8e7a51d · 8e7a51d
1 parent 258a6f6
commit 8e7a51d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.WinUI/SKXamlCanvas.cs b/source/SkiaSharp.Views/SkiaSharp.Views.WinUI/SKXamlCanvas.cs
@@ -101,7 +101,7 @@ private static void OnVisibilityChanged(DependencyObject d, DependencyPropertyCh
 		private void OnXamlRootChanged(XamlRoot xamlRoot = null, XamlRootChangedEventArgs e = null)
 		{
 			var root = xamlRoot ?? XamlRoot;
-			Dpi = root.RasterizationScale;
+			Dpi = root?.RasterizationScale ?? 1.0;
 			Invalidate();
 		}
 #else
@@ -141,7 +141,10 @@ private void OnUnloaded(object sender, RoutedEventArgs e)
 				return;
 
 #if WINDOWS
-			XamlRoot.Changed -= OnXamlRootChanged;
+			if(XamlRoot != null)
+			{
+				XamlRoot.Changed -= OnXamlRootChanged;
+			}
 #else
 			var display = DisplayInformation.GetForCurrentView();
 			display.DpiChanged -= OnDpiChanged;