From 7b2c4034f1774d14d1ae260b1855c98d101c44b6 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 23 May 2012 16:46:53 -0400 Subject: [PATCH] Fix for STORM-1854: Linux Viewer crashes on startup after update to Fontconfig 2.9.0 Thanks to Johnnie Carling https://jira.secondlife.com/browse/STORM-1854?focusedCommentId=325106&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-325106 --- indra/llwindow/llwindowsdl.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index 7458dbdc9..f425abe40 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -2621,8 +2621,9 @@ std::vector LLWindowSDL::getDynamicFallbackFontList() if (sortpat) { // Sort the list of system fonts from most-to-least-desirable. + FcResult fresult; fs = FcFontSort(NULL, sortpat, elide_unicode_coverage, - NULL, NULL); + NULL, &fresult); FcPatternDestroy(sortpat); }