Browse Source
Merge pull request #3230 from AvaloniaUI/fixes/dont-crash-embedded-font-not-resolved
dont crash if embedded font is not resolved.
pull/3229/head
danwalmsley
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
src/Skia/Avalonia.Skia/SKTypefaceCollection.cs
|
|
@ -31,7 +31,7 @@ namespace Avalonia.Skia |
|
|
|
|
|
|
|
|
return _fontFamilies.TryGetValue(familyName, out var fontFamily) ? |
|
|
return _fontFamilies.TryGetValue(familyName, out var fontFamily) ? |
|
|
fontFamily.GetOrAdd(key, GetFallback(fontFamily, key)) : |
|
|
fontFamily.GetOrAdd(key, GetFallback(fontFamily, key)) : |
|
|
null; |
|
|
new TypefaceCollectionEntry(Typeface.Default, SkiaSharp.SKTypeface.Default); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private static TypefaceCollectionEntry GetFallback(IDictionary<FontKey, TypefaceCollectionEntry> fontFamily, FontKey key) |
|
|
private static TypefaceCollectionEntry GetFallback(IDictionary<FontKey, TypefaceCollectionEntry> fontFamily, FontKey key) |
|
|
|
