BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Font: attempt fallback font, abort if no fonts found.

Browse Source 
If you happen to have a font_path setting that is incorrect,
minetest will just attempt to start the gui without a valid
font which leads to a segfault later on.

We can attempt to load the fallback font path fairly easy,
but if that fails we should give up with a proper error message
and not a weird segfault later. This forces an abort() if
the fallback fails as well, and prints a useful error
message to the console.
This commit is contained in:
Auke Kok 2017-02-18 11:40:37 -08:00 committed by paramat
parent 0a6e53bd31
commit f1ab42fdff
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/fontengine.cpp
View File

@ -343,11 +343,31 @@ void FontEngine::initFont(unsigned int basesize, FontMode mode)
if (font != NULL) { if (font != NULL) {
m_font_cache[mode][basesize] = font; m_font_cache[mode][basesize] = font;
return;
} }
else {
// try fallback font
errorstream << "FontEngine: failed to load: " << font_path << ", trying to fall back "
"to fallback font" << std::endl;
font_path = g_settings->get(font_config_prefix + "fallback_font_path");
font = gui::CGUITTFont::createTTFont(m_env,
font_path.c_str(), size, true, true, font_shadow,
font_shadow_alpha);
if (font != NULL) {
m_font_cache[mode][basesize] = font;
return;
}
// give up
errorstream << "FontEngine: failed to load freetype font: " errorstream << "FontEngine: failed to load freetype font: "
<< font_path << std::endl; << font_path << std::endl;
} errorstream << "minetest can not continue without a valid font. Please correct "
"the 'font_path' setting or install the font file in the proper "
"location" << std::endl;
abort();
} }
#endif #endif
} }