From 25967b4a0f443b33169fe76c176dc29e48786d11 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Sat, 26 Aug 2023 09:21:12 -0400
Subject: [PATCH] Fix font map cache access creating invalid entries (and
crashes)
---
common/font/font.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/common/font/font.cpp b/common/font/font.cpp
index 8d6c8c4f6b..810b797368 100644
--- a/common/font/font.cpp
+++ b/common/font/font.cpp
@@ -150,7 +150,10 @@ FONT* FONT::GetFont( const wxString& aFontName, bool aBold, bool aItalic )
std::tuple<wxString, bool, bool> key = { aFontName, aBold, aItalic };
- FONT* font = s_fontMap[key];
+ FONT* font = nullptr;
+
+ if( s_fontMap.find( key ) != s_fontMap.end() )
+ font = s_fontMap[key];
if( !font )
font = OUTLINE_FONT::LoadFont( aFontName, aBold, aItalic );