소스 검색

Merge pull request #1213 from PixiEditor/improvement/font-throw

Throw on failed font load
Krzysztof Krysiński 2 달 전
부모
커밋
053228a441
2개의 변경된 파일8개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      src/Drawie
  2. 7 1
      src/PixiEditor/Models/IO/CustomDocumentFormats/FontDocumentBuilder.cs

+ 1 - 1
src/Drawie

@@ -1 +1 @@
-Subproject commit fa8a969891227f91f25f5444be9ad47aab352782
+Subproject commit 9e5f6dc3ab03cd67fa157b0952e7bb510c465e8b

+ 7 - 1
src/PixiEditor/Models/IO/CustomDocumentFormats/FontDocumentBuilder.cs

@@ -14,7 +14,13 @@ internal class FontDocumentBuilder : IDocumentBuilder
 
     public void Build(DocumentViewModelBuilder builder, string path)
     {
-        Font font = Font.FromFontFamily(new FontFamilyName(new Uri(path), Path.GetFileNameWithoutExtension(path)));
+        Font? font = Font.FromFontFamily(new FontFamilyName(new Uri(path), Path.GetFileNameWithoutExtension(path)));
+
+        if (font is null)
+        {
+            throw new Exception("Failed to load font");
+        }
+
         font.Size = 12;
 
         List<char> glyphs = new();