mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #10993: Crash log when font caches not initialised (#11024) 

See also: #10836
pull/11027/head
Jonathan G Rennison 2023-06-17 17:56:27 +01:00 committed by GitHub
parent 1d902a97ce
commit a6b625eea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/crashlog.cpp
View File

@ -183,10 +183,10 @@ void CrashLog::LogConfiguration(std::back_insert_iterator<std::string> &output_i
" Medium: {}\n" " Medium: {}\n"
" Large: {}\n" " Large: {}\n"
" Mono: {}\n\n", " Mono: {}\n\n",
FontCache::Get(FS_SMALL)->GetFontName(), FontCache::GetName(FS_SMALL),
FontCache::Get(FS_NORMAL)->GetFontName(), FontCache::GetName(FS_NORMAL),
FontCache::Get(FS_LARGE)->GetFontName(), FontCache::GetName(FS_LARGE),
FontCache::Get(FS_MONO)->GetFontName() FontCache::GetName(FS_MONO)
); );
fmt::format_to(output_iterator, "AI Configuration (local: {}) (current: {}):\n", _local_company, _current_company); fmt::format_to(output_iterator, "AI Configuration (local: {}) (current: {}):\n", _local_company, _current_company);

15
src/fontcache.cpp
View File

@ -53,6 +53,21 @@ int FontCache::GetDefaultFontHeight(FontSize fs)
return _default_font_height[fs]; return _default_font_height[fs];
} }
/**
* Get the font name of a given font size.
* @param fs The font size to look up.
* @return The font name.
*/
std::string FontCache::GetName(FontSize fs)
{
FontCache *fc = FontCache::Get(fs);
if (fc != nullptr) {
return fc->GetFontName();
} else {
return "[NULL]";
}
}
/** /**
* Get height of a character for a given font size. * Get height of a character for a given font size.

2
src/fontcache.h
View File

@ -147,6 +147,8 @@ public:
return FontCache::caches[fs]; return FontCache::caches[fs];
} }
static std::string GetName(FontSize fs);
/** /**
* Check whether the font cache has a parent. * Check whether the font cache has a parent.
*/ */