ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid crashing if color emoji failed to load

Browse Source
This commit is contained in:
Benau 2019-06-29 01:38:23 +08:00
parent b3200937da
commit 35c70a16b5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/font/font_manager.cpp
View File

@ -555,8 +555,13 @@ FT_Face FontManager::loadColorEmoji()
FT_Face face = NULL; FT_Face face = NULL;
const std::string loc = file_manager->getAssetChecked(FileManager::TTF, const std::string loc = file_manager->getAssetChecked(FileManager::TTF,
stk_config->m_color_emoji_ttf.c_str(), true); stk_config->m_color_emoji_ttf.c_str(), true);
font_manager->checkFTError(FT_New_Face( FT_Error err = FT_New_Face(m_ft_library, loc.c_str(), 0, &face);
m_ft_library, loc.c_str(), 0, &face), loc + " is loaded"); if (err > 0)
{
Log::error("FontManager", "Something wrong when loading color emoji! "
"The error code was %d.", err);
return NULL;
}
if (!FT_HAS_COLOR(face) || face->num_fixed_sizes == 0) if (!FT_HAS_COLOR(face) || face->num_fixed_sizes == 0)
{ {