diff --exclude CVS --exclude .git -uNr fltk-2.0.x/src/x11/Font_xlfd.cxx fltk-2.0.x.modified/src/x11/Font_xlfd.cxx --- fltk-2.0.x/src/x11/Font_xlfd.cxx 2007-10-17 17:46:35.000000000 -0200 +++ fltk-2.0.x.modified/src/x11/Font_xlfd.cxx 2009-07-13 15:44:17.000000000 -0300 @@ -536,10 +536,12 @@ unsigned size = unsigned(psize); // See if the current font is correct: + if(f && f->encoding && encoding_) { if (font == current_font_ && psize == current_size_ && (f->encoding==encoding_ || (!encoding_ || !strcmp(f->encoding, encoding_)))) return; + } current_font_ = font; current_size_ = psize; // search the FontSize we have generated already: