Skip to content

Commit 487845b

Browse files
committed
Don't load a bitmap font when an XFT font is found
If an XFT font is successfully found, don't look for a fallback bitmap font.
1 parent 5ecf258 commit 487845b

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

de/font.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ DEFont *de_load_font(const char *fontname)
8787
#ifdef HAVE_X11_BMF
8888
#ifdef HAVE_X11_XFT
8989
bitmap_font:
90+
if(font==NULL){
9091
#endif
9192

9293
if(ioncore_g.use_mb){
@@ -116,6 +117,9 @@ DEFont *de_load_font(const char *fontname)
116117
}
117118
return NULL;
118119
}
120+
#ifdef HAVE_X11_XFT
121+
}
122+
#endif /* HAVE_X11_XFT */
119123
#endif /* HAVE_X11_BMF */
120124

121125
fnt=ALLOC(DEFont);

0 commit comments

Comments
 (0)