Fl_Xlib_Font_Descriptor does not need char glok[64] when USE_XFT is on

2 files changed, 4 insertions, 4 deletions

diff --git a/src/drivers/Xlib/Fl_Font.H b/src/drivers/Xlib/Fl_Font.H
index 3b220e5d3..474d6ce78 100644
--- a/src/drivers/Xlib/Fl_Font.H
+++ b/src/drivers/Xlib/Fl_Font.H
@@ -44,10 +44,10 @@ public:
 #  else
   XUtf8FontStruct* font;        // X UTF-8 font information
   FL_EXPORT Fl_Xlib_Font_Descriptor(const char* xfontname);
-#  endif
 #  if HAVE_GL
   char glok[64];
 #  endif // HAVE_GL
+#  endif // USE_XFT
   FL_EXPORT ~Fl_Xlib_Font_Descriptor();
 };
 
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index dc70b9c3e..d16e98a01 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -674,15 +674,15 @@ void Fl_X11_Gl_Window_Driver::gl_bitmap_font(Fl_Font_Descriptor *fl_fontsize) {
 
 
 void Fl_X11_Gl_Window_Driver::get_list(Fl_Font_Descriptor *fd, int r) {
-  Fl_Xlib_Font_Descriptor *gl_fd = (Fl_Xlib_Font_Descriptor*)fd;
-  if (gl_fd->glok[r]) return;
-  gl_fd->glok[r] = 1;
 # if USE_XFT
   /* We hope not to come here: We hope that any system using XFT will also
    * have sufficient GL capability to support our font texture pile mechansim,
    * allowing XFT to render the face directly. */
   // Face already set by gl_bitmap_font in this case.
 # else
+  Fl_Xlib_Font_Descriptor *gl_fd = (Fl_Xlib_Font_Descriptor*)fd;
+  if (gl_fd->glok[r]) return;
+  gl_fd->glok[r] = 1;
   unsigned int ii = r * 0x400;
   for (int i = 0; i < 0x400; i++) {
     XFontStruct *font = NULL;