improved the memory leak prevention

[dwm.git] / draw.c

diff --git a/draw.c b/draw.c
index a67ac58..cef5efb 100644 (file)
--- a/draw.c
+++ b/draw.c
@@ -170,8 +170,8 @@ setfont(const char *fontstr) {
        char **missing, *def;
        int i, n;
 
        char **missing, *def;
        int i, n;
 

+       setlocale(LC_CTYPE, "");

        missing = NULL;
        missing = NULL;

-       setlocale(LC_ALL, "");

        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);


@@ -179,10 +179,6 @@ setfont(const char *fontstr) {
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);
                while(n--)
                        fprintf(stderr, "missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);

-               if(dc.font.set) {
-                       XFreeFontSet(dpy, dc.font.set);
-                       dc.font.set = NULL;
-               }

        }
        if(dc.font.set) {
                XFontSetExtents *font_extents;
        }
        if(dc.font.set) {
                XFontSetExtents *font_extents;