From 9787f6a3174699e4684d1b2e32342cb172ef479e Mon Sep 17 00:00:00 2001 From: iota97 Date: Sun, 24 Apr 2022 14:13:47 +0200 Subject: [PATCH] Fix lazy loading of metadata --- UI/Theme.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/UI/Theme.cpp b/UI/Theme.cpp index 91e1ea780d..84091246e7 100644 --- a/UI/Theme.cpp +++ b/UI/Theme.cpp @@ -165,18 +165,16 @@ static UI::Style MakeStyle(uint32_t fg, uint32_t bg) { static void LoadAtlasMetadata(Atlas &metadata, const char *filename, bool required) { size_t atlas_data_size = 0; - if (!metadata.IsMetadataLoaded()) { - const uint8_t *atlas_data = VFSReadFile(filename, &atlas_data_size); - bool load_success = atlas_data != nullptr && metadata.Load(atlas_data, atlas_data_size); - if (!load_success) { - if (required) - ERROR_LOG(G3D, "Failed to load %s - graphics will be broken", filename); - else - WARN_LOG(G3D, "Failed to load %s", filename); - // Stumble along with broken visuals instead of dying... - } - delete[] atlas_data; + const uint8_t *atlas_data = VFSReadFile(filename, &atlas_data_size); + bool load_success = atlas_data != nullptr && metadata.Load(atlas_data, atlas_data_size); + if (!load_success) { + if (required) + ERROR_LOG(G3D, "Failed to load %s - graphics will be broken", filename); + else + WARN_LOG(G3D, "Failed to load %s", filename); + // Stumble along with broken visuals instead of dying... } + delete[] atlas_data; } void UpdateTheme(UIContext *ctx) {