From 34f5fc46fb96dbd2e0273223c5bd58e6dc920d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= <kovacsadam07@outlook.hu>
Date: Fri, 30 Jun 2023 19:48:19 +0200
Subject: [PATCH] Return default font

---
 .../Avalonia/FileTime.GuiApp.Font/Font/Startup.cs      |  2 +-
 .../FileTime.GuiApp.Font/Services/FontService.cs       | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.Font/Font/Startup.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.Font/Font/Startup.cs
index 5a016d3..4308e47 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.Font/Font/Startup.cs
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.Font/Font/Startup.cs
@@ -9,7 +9,7 @@ public static class Startup
 {
     public static IServiceCollection ConfigureFont(this IServiceCollection services, IConfigurationRoot configurationRoot)
     {
-        services.Configure<FontConfiguration>(configurationRoot.GetSection(FontConfiguration.SectionName));
+        services.AddOptions<FontConfiguration>().Bind(configurationRoot.GetSection(FontConfiguration.SectionName));
         services.AddSingleton<IFontService, FontService>();
         return services;
     }
diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.Font/Services/FontService.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.Font/Services/FontService.cs
index 0c35124..3bf8f91 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.Font/Services/FontService.cs
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.Font/Services/FontService.cs
@@ -21,14 +21,12 @@ public class FontService : IFontService
         UpdateFonts(fontConfiguration.CurrentValue, null);
     }
 
-    private void UpdateFonts(FontConfiguration newConfiguration, string? arg2)
-    {
-        _mainFont.OnNext(GetMainFont());
-    }
+    private void UpdateFonts(FontConfiguration newConfiguration, string? _) => _mainFont.OnNext(GetMainFont());
 
-    public string? GetMainFont()
+    public string GetMainFont()
     {
         var installedFonts = FontManager.Current.SystemFonts.Select(f => f.Name).ToList();
-        return _fontConfiguration.CurrentValue.Main.Find(installedFonts.Contains);
+        return _fontConfiguration.CurrentValue.Main.FirstOrDefault(installedFonts.Contains) 
+               ?? FontManager.Current.DefaultFontFamily.Name;
     }
 }
\ No newline at end of file