Browse Source

Fix FontManager crash (#12982)

pull/12987/head
Max Katz 3 years ago
committed by GitHub
parent
commit
d6ecb517b8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      src/Avalonia.Base/Media/FontManager.cs

10
src/Avalonia.Base/Media/FontManager.cs

@ -143,11 +143,6 @@ namespace Avalonia.Media
{ {
var source = key.Source; var source = key.Source;
if (source.Scheme == SystemFontScheme)
{
return SystemFonts.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface);
}
if (!source.IsAbsoluteUri) if (!source.IsAbsoluteUri)
{ {
if (key.BaseUri == null) if (key.BaseUri == null)
@ -158,6 +153,11 @@ namespace Avalonia.Media
source = new Uri(key.BaseUri, source); source = new Uri(key.BaseUri, source);
} }
if (source.Scheme == SystemFontScheme)
{
return SystemFonts.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface);
}
if (TryGetFontCollection(source, out var fontCollection) && if (TryGetFontCollection(source, out var fontCollection) &&
fontCollection.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface)) fontCollection.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface))
{ {

Loading…
Cancel
Save