From fb7469c85c86a1a5dc62f5feaf540dbd7307600e Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Fri, 24 Jun 2022 19:50:47 +0200
Subject: Fix for issue #452: Fl::get_font_name failure on OS-X.

---
 src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
index b89e359ad..f34d36d54 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver_font.cxx
@@ -317,12 +317,14 @@ double Fl_Quartz_Graphics_Driver::width(unsigned int wc) {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
 static void set_fontname_CoreText(Fl_Fontdesc *f) {
   CFStringRef cfname = CFStringCreateWithCString(NULL, f->name, kCFStringEncodingUTF8);
-  CTFontRef ctfont = CTFontCreateWithName(cfname, 0, NULL);
-  CFRelease(cfname);
-  cfname = CTFontCopyFullName(ctfont);
-  CFRelease(ctfont);
-  CFStringGetCString(cfname, f->fontname, ENDOFBUFFER, kCFStringEncodingUTF8);
-  CFRelease(cfname);
+  CTFontRef ctfont = cfname ? CTFontCreateWithName(cfname, 0, NULL) : NULL;
+  if (cfname) CFRelease(cfname);
+  if (ctfont) {
+    cfname = CTFontCopyFullName(ctfont);
+    CFRelease(ctfont);
+    CFStringGetCString(cfname, f->fontname, ENDOFBUFFER, kCFStringEncodingUTF8);
+    CFRelease(cfname);
+  } else strlcpy(f->fontname, f->name, ENDOFBUFFER);
 }
 #endif
 
-- 
cgit v1.2.3