fix: Fix NRE in FontDetailsCache

jeromelaban · Jun 25, 2024 · 80a87a3 · 80a87a3
1 parent e43bbeb
commit 80a87a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs b/src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs
@@ -38,8 +38,8 @@ private static FontDetails GetFontInternal(
 
 		SKTypeface GetDefaultTypeFace()
 		{
-			// if Segoe UI is not found, it will automatically return a system default
-			return SKTypeface.FromFamilyName(FeatureConfiguration.Font.DefaultTextFontFamily, skWeight, skWidth, skSlant);
+			return SKTypeface.FromFamilyName(FeatureConfiguration.Font.DefaultTextFontFamily, skWeight, skWidth, skSlant)
+				?? SKTypeface.FromFamilyName(null, skWeight, skWidth, skSlant);
 		}
 
 		if (name == null || string.Equals(name, "XamlAutoFontFamily", StringComparison.OrdinalIgnoreCase))