From 3a2a3b556497da78489ea4021f6e947a5e1cb53b Mon Sep 17 00:00:00 2001
From: adams85 <31276480+adams85@users.noreply.github.com>
Date: Mon, 29 Dec 2025 10:16:47 +0100
Subject: [PATCH] Fix NRE bug in TextShaperImpl.ShapeText on netstandard2.0
 (#20369)

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

* Revert whitespace changes
---
 src/Skia/Avalonia.Skia/TextShaperImpl.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Skia/Avalonia.Skia/TextShaperImpl.cs b/src/Skia/Avalonia.Skia/TextShaperImpl.cs
index 91a94de6f6..8b78877b82 100644
--- 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,