From d6ecb517b8dd2597aa72fb09cad65b299b8d9bb1 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Fri, 22 Sep 2023 01:37:00 -0700 Subject: [PATCH] Fix FontManager crash (#12982) --- src/Avalonia.Base/Media/FontManager.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Avalonia.Base/Media/FontManager.cs b/src/Avalonia.Base/Media/FontManager.cs index af7a58dbe1..4d14e57a32 100644 --- a/src/Avalonia.Base/Media/FontManager.cs +++ b/src/Avalonia.Base/Media/FontManager.cs @@ -143,11 +143,6 @@ namespace Avalonia.Media { var source = key.Source; - if (source.Scheme == SystemFontScheme) - { - return SystemFonts.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface); - } - if (!source.IsAbsoluteUri) { if (key.BaseUri == null) @@ -158,6 +153,11 @@ namespace Avalonia.Media 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) && fontCollection.TryGetGlyphTypeface(familyName, typeface.Style, typeface.Weight, typeface.Stretch, out glyphTypeface)) {