Fix NRE bug in TextShaperImpl.ShapeText on netstandard2.0 (#20369)

* Fix NRE bug in TextShaperImpl.ShapeText on netstandard2.0 (#20364) * Revert whitespace changes
9 months ago · 3a2a3b5564
1 changed files with 5 additions and 1 deletions
--- a/src/Skia/Avalonia.Skia/TextShaperImpl.cs
+++ b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
@ -44,7 +44,11 @@ namespace Avalonia.Skia
            var usedCulture = culture ?? CultureInfo.CurrentCulture;

 #if NETSTANDARD2_0
-            buffer.Language = s_cachedLanguage.GetOrAdd(usedCulture.LCID, _ => new Language(culture));
+            if (!s_cachedLanguage.TryGetValue(usedCulture.LCID, out var language))
+            {
+                language = s_cachedLanguage.GetOrAdd(usedCulture.LCID, new Language(usedCulture));
+            }
+            buffer.Language = language;
 #else
            buffer.Language = s_cachedLanguage.GetOrAdd(
                usedCulture.LCID,