fix: Compare the right font in OnFontLoaded when FontFamily contains '#'

unoplatform · Sep 5, 2024 · 3843646 · 3843646
1 parent 05b4e32
commit 3843646
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs b/src/Uno.UI/UI/Xaml/Documents/TextFormatting/FontDetailsCache.skia.cs
@@ -93,7 +93,7 @@ private static FontDetails GetFontInternal(
 
 		SKTypeface? skTypeFace;
 		bool temporaryDefaultFont = false;
-
+		var originalName = name;
 		var hashIndex = name.IndexOf('#');
 		if (hashIndex > 0)
 		{
@@ -112,7 +112,7 @@ private static FontDetails GetFontInternal(
 				else
 				{
 					// Load failed.
-					OnFontLoaded(name, null);
+					OnFontLoaded(originalName, null);
 					skTypeFace = null;
 				}
 			}
@@ -128,12 +128,12 @@ private static FontDetails GetFontInternal(
 						{
 							if (task.IsCompletedSuccessfully)
 							{
-								OnFontLoaded(name, task.Result);
+								OnFontLoaded(originalName, task.Result);
 							}
 							else
 							{
 								// Load failed.
-								OnFontLoaded(name, null);
+								OnFontLoaded(originalName, null);
 							}
 						}
 						catch (Exception e)