Merge branch 'master' of https://github.com/matubu/kitty

kovidgoyal · Oct 18, 2024 · 2efa394 · 2efa394
2 parents d31459b + b0e49d7
commit 2efa394
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/kitty/fontconfig.c b/kitty/fontconfig.c
@@ -520,7 +520,7 @@ create_fallback_face(PyObject UNUSED *base_face, CPUCell* cell, bool bold, bool
             }
         }
         ans = face_from_descriptor(d, fg);
-        if (!glyph_found) glyph_found = has_cell_text(face_has_codepoint, ans, cell, false);
+        if (!glyph_found && ans) glyph_found = has_cell_text(face_has_codepoint, ans, cell, false);
     }
 end:
     Py_CLEAR(d);

diff --git a/kitty/freetype.c b/kitty/freetype.c
@@ -279,7 +279,7 @@ face_from_descriptor(PyObject *descriptor, FONTS_DATA_HANDLE fg) {
     if (retval != NULL) {
         Face *self = (Face *)retval;
         int error;
-        if ((error = FT_New_Face(library, path, index, &(self->face)))) { self->face = NULL; set_load_error(path, error); }
+        if ((error = FT_New_Face(library, path, index, &(self->face)))) { self->face = NULL; return set_load_error(path, error); }
         if (!init_ft_face(self, PyDict_GetItemString(descriptor, "path"), hinting, hint_style, fg)) return NULL;
         PyObject *ns = PyDict_GetItemString(descriptor, "named_style");
         if (ns) {