Fix _skFontManager.MatchTypeface crash

4 years ago · adfa09fec1
1 changed files with 4 additions and 1 deletions
--- a/src/Skia/Avalonia.Skia/FontManagerImpl.cs
+++ b/src/Skia/Avalonia.Skia/FontManagerImpl.cs
@ -132,7 +132,10 @@ namespace Avalonia.Skia
                    break;
                }

-                skTypeface ??= _skFontManager.MatchTypeface(SKTypeface.Default, fontStyle);
+                // MatchTypeface can return "null" if matched typeface wasn't found for the style
+                // Fallback to the default typeface and styles instead.
+                skTypeface ??= _skFontManager.MatchTypeface(SKTypeface.Default, fontStyle)
+                    ?? SKTypeface.Default;
            }
            else
            {