From b608c0505642e4ad73339568dba34a00d457ad86 Mon Sep 17 00:00:00 2001 From: "tor%cs.brown.edu" Date: Tue, 6 Jan 2004 16:50:13 +0000 Subject: [PATCH] Bug 205310 - some PNG files displayed with a garbage mask. r=biesi, sr=blizzard, a=chofmann --- gfx/src/gtk/nsFontMetricsXft.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfx/src/gtk/nsFontMetricsXft.cpp b/gfx/src/gtk/nsFontMetricsXft.cpp index a8599faaada..c9348d1a652 100644 --- a/gfx/src/gtk/nsFontMetricsXft.cpp +++ b/gfx/src/gtk/nsFontMetricsXft.cpp @@ -1141,7 +1141,7 @@ nsFontMetricsXft::SetupFCPattern(void) // If there's a generic add a pref for the generic if there's one // set. - if (mGenericFont) { + if (mGenericFont && (mFontList.Count()==1)) { nsCString name; name += "font.name."; name += mGenericFont->get(); @@ -1176,7 +1176,7 @@ nsFontMetricsXft::SetupFCPattern(void) } // Add the generic if there is one. - if (mGenericFont) + if (mGenericFont && (mFontList.Count()==1)) AddFFRE(mPattern, mGenericFont, PR_FALSE); if (PR_LOG_TEST(gXftFontLoad, PR_LOG_DEBUG)) {