removed hardcoded 'fixed' fallback, useless and misleading

diff --git a/config.mk b/config.mk
index 280a0346dc00fedc761eddb94bfd66bf8a081705..bc89b164d2d89dc23d67f7828245d084eec314cf 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dmenu version
-VERSION = 1.6
+VERSION = 1.7
 
 # Customize below to fit your system
 

diff --git a/draw.c b/draw.c
index bd11091e97d283f50ddd726538ad2d666b7e3de3..ea02c4df796b81b1d7fbc2cf435140633780f0cd 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -107,10 +107,7 @@ setfont(const char *fontstr) {
                if(dc.font.xfont)
                        XFreeFont(dpy, dc.font.xfont);
                dc.font.xfont = NULL;
-               dc.font.xfont = XLoadQueryFont(dpy, fontstr);
-               if (!dc.font.xfont)
-                       dc.font.xfont = XLoadQueryFont(dpy, "fixed");
-               if (!dc.font.xfont)
+               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
                        eprint("error, cannot init 'fixed' font\n");
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;