From 7a1f397de694b5e84fca94de92e644c946ff3ddc Mon Sep 17 00:00:00 2001 From: Anthony Nicholls Date: Wed, 18 Dec 2024 15:57:32 +0000 Subject: [PATCH] Fonts (Linux): Return a null typeface when no default typefaces can be found --- modules/juce_graphics/native/juce_Fonts_linux.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/juce_graphics/native/juce_Fonts_linux.cpp b/modules/juce_graphics/native/juce_Fonts_linux.cpp index 59dfc6cb6f..ac76e53123 100644 --- a/modules/juce_graphics/native/juce_Fonts_linux.cpp +++ b/modules/juce_graphics/native/juce_Fonts_linux.cpp @@ -143,7 +143,12 @@ private: if (name.containsIgnoreCase (choice)) return name; - return names[0]; + for (auto& name : names) + if (name.isNotEmpty()) + return name; + + jassertfalse; + return {}; } static String getDefaultSansSerifFontName() @@ -200,8 +205,11 @@ Typeface::Ptr Font::Native::getDefaultPlatformTypefaceForFont (const Font& font) const auto name = font.getTypefaceName(); const auto realName = defaultInfo.getRealFontName (name); - f.setTypefaceName (realName); + if (realName.isEmpty()) + return nullptr; + + f.setTypefaceName (realName); return Typeface::createSystemTypefaceFor (f); }