From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 22 Jan 2006 17:40:08 +0000 (+0000)
Subject: (LY_DEFINE): store name before destroying face.
X-Git-Tag: release/2.7.29~43
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e93347cf7fd1d43f11a36188d82f7bd09cb4fd26;p=lilypond.git

(LY_DEFINE): store name before destroying face.
---

diff --git a/ChangeLog b/ChangeLog
index d8d686364f..25e13176e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-01-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/ttf.cc (LY_DEFINE): store name before destroying face.
+
 	* mf/GNUmakefile: idem.
 
 	* buildscripts/mf-to-table.py (help): excise fetaXXlist.ly support.
diff --git a/lily/ttf.cc b/lily/ttf.cc
index 78530d00da..31fc47b07b 100644
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -191,7 +191,6 @@ LY_DEFINE (ly_font_glyph_list, "ly:font-glyph-list",
     }
   
   FT_Done_Face (face);
-
   if (be_verbose_global)
     progress_indication ("]");  
   return retval;
@@ -209,13 +208,14 @@ LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name",
 
   FT_Face face = open_ft_face (file_name);
   char const *ps_name_str0 = FT_Get_Postscript_Name (face);
+  SCM ps_name = scm_makfrom0str (ps_name_str0 ? ps_name_str0 : "");
   
   FT_Done_Face (face);
   
   if (be_verbose_global)
     progress_indication ("]");
-
-  return scm_makfrom0str (ps_name_str0 ? ps_name_str0 : "");
+  
+  return ps_name;
 }