diff --git a/modules/juce_graphics/fonts/juce_Font.cpp b/modules/juce_graphics/fonts/juce_Font.cpp index 59e07b3e13..92fd06192f 100644 --- a/modules/juce_graphics/fonts/juce_Font.cpp +++ b/modules/juce_graphics/fonts/juce_Font.cpp @@ -836,9 +836,19 @@ Font Font::findSuitableFontForText (const String& text, const String& language) return copy; } - if (auto current = getTypefacePtr()) + const auto fallbackTypefacePtr = std::invoke ([&] { - if (auto suggested = current->createSystemFallback (text, language)) + if (auto current = getTypefacePtr()) + return current; + + auto copy = *this; + copy.setTypefaceName (Font::getDefaultSansSerifFontName()); + return copy.getTypefacePtr(); + }); + + if (fallbackTypefacePtr != nullptr) + { + if (auto suggested = fallbackTypefacePtr->createSystemFallback (text, language)) { auto copy = *this;