From 2f5fde32487e64acd0896212887e8dd3d30ad754 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 27 Jun 2006 18:43:23 +0000 Subject: [PATCH] fail more gracefully when no Xft fonts are available at run-time svn: r3506 --- src/wxxt/src/GDI-Classes/Font.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wxxt/src/GDI-Classes/Font.cc b/src/wxxt/src/GDI-Classes/Font.cc index e528952500..7bdf600656 100644 --- a/src/wxxt/src/GDI-Classes/Font.cc +++ b/src/wxxt/src/GDI-Classes/Font.cc @@ -771,6 +771,7 @@ static wxFontStruct *wxLoadQueryNearestAAFont(const char *name, XftResult res; pat = XftNameParse(name XFORM_OK_PLUS 1); + if (!pat) return NULL; pat = XftPatternBuild(pat, (sip ? XFT_PIXEL_SIZE : XFT_SIZE), XftTypeInteger, point_size, @@ -781,6 +782,7 @@ static wxFontStruct *wxLoadQueryNearestAAFont(const char *name, NULL); pat = XftFontMatch(wxAPP_DISPLAY, DefaultScreen(wxAPP_DISPLAY), pat, &res); + if (!pat) return NULL; if (use_rot) { /* We add a transform after match, because Xft/fontconfig