Xinqi Bao's Git

projects / dwm.git / commitdiff
summary | log | commit | diff | tree
raw | patch | inline | side by side (from parent 1: e7d41cc)
update draw.c
authorConnor Lane Smith <[email protected]>
Sat, 21 May 2011 19:26:26 +0000 (20:26 +0100)
committerConnor Lane Smith <[email protected]>
Sat, 21 May 2011 19:26:26 +0000 (20:26 +0100)
draw.c patch | blob | history

diff --git a/draw.c b/draw.c
index 341a26f..2028fd9 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -126,13 +126,13 @@ loadfont(DC *dc, const char *fontstr) {
 
        if(!*fontstr)
                return False;
 
        if(!*fontstr)
                return False;
-       if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
+       if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def)))
                n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
                n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
-       }
-       else {
-               dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr);
+       else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr)))
                xfonts = &dc->font.xfont;
                xfonts = &dc->font.xfont;
-       }
+       else
+               n = 0;
+
        for(i = 0; i < n; i++) {
                dc->font.ascent  = MAX(dc->font.ascent,  xfonts[i]->ascent);
                dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
        for(i = 0; i < n; i++) {
                dc->font.ascent  = MAX(dc->font.ascent,  xfonts[i]->ascent);
                dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);