From edaf2256d5051665cd4599ccc37fd974f1abcb8b Mon Sep 17 00:00:00 2001 From: Paul Makles Date: Mon, 31 Jan 2022 01:04:13 +0000 Subject: [PATCH] fix(theme): don't crash the app on invalid fonts --- src/context/Theme.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/context/Theme.tsx b/src/context/Theme.tsx index 4c1d523e..42383cad 100644 --- a/src/context/Theme.tsx +++ b/src/context/Theme.tsx @@ -330,13 +330,21 @@ export default observer(() => { useEffect(() => { const font = theme.getFont() ?? DEFAULT_FONT; root.setProperty("--font", `"${font}"`); - FONTS[font].load(); + try { + FONTS[font].load(); + } catch (err) { + console.error(`Failed to load font: ${font}`); + } }, [root, theme.getFont()]); useEffect(() => { const font = theme.getMonospaceFont() ?? DEFAULT_MONO_FONT; root.setProperty("--monospace-font", `"${font}"`); - MONOSPACE_FONTS[font].load(); + try { + MONOSPACE_FONTS[font].load(); + } catch (err) { + console.error(`Failed to load monospace font: ${font}`); + } }, [root, theme.getMonospaceFont()]); useEffect(() => {