aboutsummaryrefslogtreecommitdiff
path: root/src/ResourceLoader.cpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2021-11-21 07:37:26 +0100
committerdec05eba <dec05eba@protonmail.com>2021-11-21 07:37:26 +0100
commit2e3465d3bdf0fa1e7df779cbd19fc90187574ae8 (patch)
tree2c32aba49d0483c48d8cadef54bfdeee2c8ac9d5 /src/ResourceLoader.cpp
parentade32bea240fa74f01d4dd4792b1069cca619bba (diff)
Remove abort if font is not available
Diffstat (limited to 'src/ResourceLoader.cpp')
-rw-r--r--src/ResourceLoader.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ResourceLoader.cpp b/src/ResourceLoader.cpp
index 89ae510..9e8a884 100644
--- a/src/ResourceLoader.cpp
+++ b/src/ResourceLoader.cpp
@@ -111,19 +111,21 @@ namespace QuickMedia::FontLoader {
if(!successfully_loaded_file) {
fprintf(stderr, "Warning: Failed to load font file: %s\n", font_file_name.c_str());
- abort();
}
mapped_file = new_memory_mapped_file.get();
font_file_cache[(unsigned int)font_type] = std::move(new_memory_mapped_file);
}
+ if(!mapped_file->data()) {
+ return nullptr;
+ }
+
mgl::Font *font = font_cache[(unsigned int)font_type][character_size].get();
if(!font) {
auto new_font = std::make_unique<mgl::Font>();
if(!new_font->load_from_file(*mapped_file, character_size)) {
fprintf(stderr, "Warning: Failed to load font at character size %u\n", character_size);
- abort();
}
font = new_font.get();