Fix "Fl::get_font_name() with Pango is inconsistent"-cont'd (#732)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
index 500a48d0d..06a8b9bae 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
@@ -1389,9 +1389,6 @@ Fl_Font Fl_Xlib_Graphics_Driver::set_fonts(const char* pattern_name)
   fl_open_display();
   int n_families, count = 0;
   PangoFontFamily **families;
-  Fl_Xlib_Graphics_Driver::context();
-  Fl_Xlib_Graphics_Driver::init_built_in_fonts();
-  pango_font_map_list_families(Fl_Xlib_Graphics_Driver::pfmap_, &families, &n_families);
   char *saved_lang = fl_getenv("LANG");
   const char *Clang = "LANG=C";
   if (saved_lang && strcmp(saved_lang, Clang)) {
@@ -1404,6 +1401,9 @@ Fl_Font Fl_Xlib_Graphics_Driver::set_fonts(const char* pattern_name)
     strcpy(saved_lang + 5, p);
     fl_putenv(Clang);
   } else saved_lang = NULL;
+  Fl_Xlib_Graphics_Driver::context();
+  Fl_Xlib_Graphics_Driver::init_built_in_fonts();
+  pango_font_map_list_families(Fl_Xlib_Graphics_Driver::pfmap_, &families, &n_families);
   for (int fam = 0; fam < n_families; fam++) {
     PangoFontFace **faces;
     int n_faces;