瀏覽代碼

Fix _skFontManager.MatchTypeface crash

Max Katz 3 年之前
父節點
當前提交
adfa09fec1
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      src/Skia/Avalonia.Skia/FontManagerImpl.cs

+ 4 - 1
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
             {