--- rxvt-unicode/src/defaultfont.C	2004/02/13 12:16:21	1.18
+++ rxvt-unicode/src/defaultfont.C	2004/02/21 20:33:40	1.21
@@ -430,7 +430,7 @@
 
   if (f)
     {
-      // the font should really exists now. if not, we have a problem
+      // the font should really exist now. if not, we have a problem
       // (e.g. if the user did xset fp rehash just when we were searching fonts).
       // in that case, just return garbage.
       bool ret = set_properties (p, f);
@@ -762,17 +762,17 @@
 void
 rxvt_font_xft::clear ()
 {
-  if (f)
-    {
-      XftFontClose (DISPLAY, f);
-      f = 0;
-    }
-
   if (d)
     {
       XftDrawDestroy (d);
       d = 0;
     }
+
+  if (f)
+    {
+      XftFontClose (DISPLAY, f);
+      f = 0;
+    }
 }
 
 rxvt_fontprop
@@ -892,8 +892,7 @@
                      const text_t *text, int len,
                      int fg, int bg)
 {
-  if (!d)
-    d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap);
+  d = XftDrawCreate (DISPLAY, DRAWABLE, r->display->visual, r->display->cmap);
 
   if (bg >= 0 && bg != Color_bg)
     XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);