gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-07-07 04:49:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Codefix: SpriteFontCache was never deleted. (#14414)

Browse Source
This commit is contained in:
Peter Nelson 2025-07-05 13:22:45 +01:00 committed by GitHub
parent ebd984d894
commit 84e9e106c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fontcache.cpp
View File

@ -43,7 +43,7 @@ FontCache::FontCache(FontSize fs) : parent(FontCache::Get(fs)), fs(fs), height(_
/** Clean everything up. */ /** Clean everything up. */
FontCache::~FontCache() FontCache::~FontCache()
{ {
assert(this->fs == this->parent->fs); assert(this->parent == nullptr || this->fs == this->parent->fs);
FontCache::caches[this->fs] = this->parent; FontCache::caches[this->fs] = this->parent;
Layouter::ResetFontCache(this->fs); Layouter::ResetFontCache(this->fs);
} }
@ -241,8 +241,7 @@ void InitFontCache(bool monospace)
void UninitFontCache() void UninitFontCache()
{ {
for (FontSize fs = FS_BEGIN; fs < FS_END; fs++) { for (FontSize fs = FS_BEGIN; fs < FS_END; fs++) {
FontCache *fc = FontCache::Get(fs); while (FontCache::Get(fs) != nullptr) delete FontCache::Get(fs);
if (fc->HasParent()) delete fc;
} }
#ifdef WITH_FREETYPE #ifdef WITH_FREETYPE