LibGfx: Ignore incorrect .font files when building the Font Database

Previously every GUI application would crash if we had an incorrect (or
empty) .font file in /res/fonts.
This commit is contained in:
Karol Kosek 2022-08-15 21:20:58 +02:00 committed by Andreas Kling
parent 6af184b48b
commit 652870c178
Notes: sideshowbarker 2024-07-17 07:33:14 +09:00

View File

@ -132,7 +132,8 @@ FontDatabase::FontDatabase()
auto path = dir_iterator.next_full_path();
if (path.ends_with(".font"sv)) {
if (auto font = Gfx::BitmapFont::load_from_file(path)) {
if (auto font_or_error = Gfx::BitmapFont::try_load_from_file(path); !font_or_error.is_error()) {
auto font = font_or_error.release_value();
m_private->full_name_to_font_map.set(font->qualified_name(), *font);
auto typeface = get_or_create_typeface(font->family(), font->variant());
typeface->add_bitmap_font(font);