From a6710a5518faacc3d3530b961d214a505dddb6c7 Mon Sep 17 00:00:00 2001
From: exoticus <56480961+exoticus@users.noreply.github.com>
Date: Fri, 17 Apr 2020 00:23:40 +0200
Subject: [PATCH] disgusting duplication but works

---
 src/renderer/caching_shaper.rs | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/renderer/caching_shaper.rs b/src/renderer/caching_shaper.rs
index 2b3f3fe..c41a197 100644
--- a/src/renderer/caching_shaper.rs
+++ b/src/renderer/caching_shaper.rs
@@ -165,18 +165,26 @@ pub fn build_collection_by_font_name(
     let mut collection = FontCollection::new();
 
     if let Some(font_name) = font_name {
-        if let Some(family) = loader.get_or_load(font_name, false) {
-            let weight = if bold { Weight::BOLD } else { Weight::NORMAL };
-            let style = if italic { Style::Italic } else { Style::Normal };
-            let properties = Properties {
-                weight,
-                style,
-                stretch: Stretch::NORMAL,
-            };
+        let weight = if bold { Weight::BOLD } else { Weight::NORMAL };
+        let style = if italic { Style::Italic } else { Style::Normal };
+        let properties = Properties {
+            weight,
+            style,
+            stretch: Stretch::NORMAL,
+        };
 
+        if let Some(family) = loader.get_or_load(font_name, false) {
             if let Some(font) = family.get(properties) {
                 collection.add_family(FontFamily::new_from_font(font.clone()));
             }
+        } else {
+            if font_name != SYSTEM_DEFAULT_FONT {
+                if let Some(family) = loader.get_or_load(SYSTEM_DEFAULT_FONT, false) {
+                    if let Some(font) = family.get(properties) {
+                        collection.add_family(FontFamily::new_from_font(font.clone()));
+                    }
+                }
+            }
         }
     }