Fix OpenTTD#10993: Crash log when font caches not initialised (OpenTT…

…D#11024) See also: OpenTTD#10836
shoter · Jul 16, 2023 · fc5513c · fc5513c
1 parent 7cf44a2
commit fc5513c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/crashlog.cpp b/src/crashlog.cpp
@@ -183,10 +183,10 @@ void CrashLog::LogConfiguration(std::back_insert_iterator<std::string> &output_i
 			" Medium: {}\n"
 			" Large:  {}\n"
 			" Mono:   {}\n\n",
-			FontCache::Get(FS_SMALL)->GetFontName(),
-			FontCache::Get(FS_NORMAL)->GetFontName(),
-			FontCache::Get(FS_LARGE)->GetFontName(),
-			FontCache::Get(FS_MONO)->GetFontName()
+			FontCache::GetName(FS_SMALL),
+			FontCache::GetName(FS_NORMAL),
+			FontCache::GetName(FS_LARGE),
+			FontCache::GetName(FS_MONO)
 	);
 
 	fmt::format_to(output_iterator, "AI Configuration (local: {}) (current: {}):\n", _local_company, _current_company);

diff --git a/src/fontcache.cpp b/src/fontcache.cpp
@@ -53,6 +53,21 @@ int FontCache::GetDefaultFontHeight(FontSize 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.

diff --git a/src/fontcache.h b/src/fontcache.h
@@ -147,6 +147,8 @@ class FontCache {
 		return FontCache::caches[fs];
 	}
 
+	static std::string GetName(FontSize fs);
+
 	/**
 	 * Check whether the font cache has a parent.
 	 */