(fontset_find_font): Check frame validity.

f3d29551 · Chong Yidong · edc3ecf3 · f3d29551
Commit f3d29551 authored Oct 08, 2008 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

src/fontset.c src/fontset.c +3 -3

No files found.
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -516,9 +516,9 @@ fontset_find_font (fontset, c, face, id, fallback)
     int id, fallback;
 {
  Lisp_Object elt, vec, font_group;
-  int i;
-  FRAME_PTR f = XFRAME (FONTSET_FRAME (fontset));
-  int charset_matched = -1;
+  int i, charset_matched = -1;
+  FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset)))
+    ? XFRAME (selected_frame) : XFRAME (FONTSET_FRAME (fontset));

  font_group = fontset_get_font_group (fontset, fallback ? -1 : c);
  if (! CONSP (font_group))