From 0960d07315977a5bc5424371e6a5fc1f6a7f33c1 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 1 Jun 2017 15:23:26 +0000
Subject: Additional check in Fl_Xlib_Graphics_Driver::font_unscaled(Fl_Font,
 Fl_Fontsize) to recognize if current font is unchanged.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12246 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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 657f867f8..8d46cb5ae 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
@@ -1190,7 +1190,7 @@ void Fl_Xlib_Graphics_Driver::font_unscaled(Fl_Font fnum, Fl_Fontsize size) {
     Fl_Graphics_Driver::font(0, 0);
     return;
   }
-  if (this->Fl_Graphics_Driver::font() == fnum && this->size_unscaled() == size) return;
+  if (this->Fl_Graphics_Driver::font() == fnum && this->size_unscaled() == size && this->font_descriptor()) return;
   fl_xft_font(this, fnum, size, 0);
   init_built_in_fonts();
   if (pfd_) pango_font_description_free(pfd_);
-- 
cgit v1.2.3