diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2011-07-22 09:22:07 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2011-07-22 09:22:07 +0000 |
| commit | 8dfecde0bdff41381e65b077420692645887c440 (patch) | |
| tree | fbad5442d81fe41a9356cc75b2c05d552ac04645 /src/libnrtype | |
| parent | Icon file vacuuming and SVG size reduction. Remove deprecated legacy icons fi... (diff) | |
| download | inkscape-8dfecde0bdff41381e65b077420692645887c440.tar.gz inkscape-8dfecde0bdff41381e65b077420692645887c440.zip | |
Patch from Andreas Becker to fix bug 805238 (Crash when setting empty font family)
(bzr r10487)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 7fc0a9715..e6d22e070 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -404,7 +404,10 @@ Glib::ustring font_factory::GetUIFamilyString(PangoFontDescription const *fontDe if (fontDescr) { // For now, keep it as family name taken from pango - family = pango_font_description_get_family(fontDescr); + const char *pangoFamily = pango_font_description_get_family(fontDescr); + if( pangoFamily ) { + family = pangoFamily; + } } return family; |