Merge 77abecb80e into 2ebd2b28a8

v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using System.IO;
 using Avalonia;
 using Avalonia.Media;
@@ -8,22 +10,22 @@ public static class AppBuilderExtension
 {
     public static AppBuilder WithFontByDefault(this AppBuilder appBuilder)
     {
+        var fallbacks = new List<FontFallback>();
+        
         var notoSansSc = new FontFamily(Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC"));
+        fallbacks.Add(new FontFallback { FontFamily = notoSansSc });
 
-        var fallbacks = new[]
+        if (OperatingSystem.IsLinux())
         {
-            new FontFallback { FontFamily = notoSansSc },
+            fallbacks.Add(new FontFallback
-
+            {
-            OperatingSystem.IsLinux()
+                FontFamily = new FontFamily("Noto Color Emoji")
-                ? new FontFallback { FontFamily = new FontFamily("Noto Color Emoji") }
+            });
-                : null
+        }
-        };
-
-        var validFallbacks = fallbacks.Where(f => f is not null).ToArray()!;
 
         return appBuilder.With(new FontManagerOptions
         {
-            FontFallbacks = validFallbacks
+            FontFallbacks = fallbacks.ToArray()
         });
     }
 }