Xinqi Bao's Git

projects / dmenu.git / commitdiff
summary | log | commit | diff | tree
raw | patch | inline | side by side (parent: d094ebe)
applied yiyus initfont fix
author[email protected] <unknown>
Wed, 19 Sep 2007 15:33:35 +0000 (17:33 +0200)
committer[email protected] <unknown>
Wed, 19 Sep 2007 15:33:35 +0000 (17:33 +0200)
dmenu.c patch | blob | history

diff --git a/dmenu.c b/dmenu.c
index 34df9ed..5cb638b 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -298,10 +298,9 @@ initfont(const char *fontstr) {
                if(dc.font.xfont)
                        XFreeFont(dpy, dc.font.xfont);
                dc.font.xfont = NULL;
                if(dc.font.xfont)
                        XFreeFont(dpy, dc.font.xfont);
                dc.font.xfont = NULL;
-               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))) {
-                       if(!(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
-                               eprint("error, cannot load font: '%s'\n", fontstr);
-               }
+               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
+               && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+                       eprint("error, cannot load font: '%s'\n", fontstr);
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
        }
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
        }