Fix stack overflow

dotnet · Jan 8, 2025 · 94bf9d9 · 94bf9d9
1 parent 0020f0d
commit 94bf9d9
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Graphics/src/Graphics.Skia/SkiaCanvasState.cs b/src/Graphics/src/Graphics.Skia/SkiaCanvasState.cs
@@ -273,10 +273,17 @@ private void UpdateTypeface()
 			if (!_typefaceInvalid)
 				return;
 
+			if (_fontPaint is not null)
+			{
 #pragma warning disable CS0618 // Type or member is obsolete
-			FontPaint.Typeface = _font?.ToSKTypeface() ?? SKTypeface.Default;
+				_fontPaint.Typeface = _font?.ToSKTypeface() ?? SKTypeface.Default;
 #pragma warning restore CS0618 // Type or member is obsolete
-			FontFont.Typeface = _font?.ToSKTypeface() ?? SKTypeface.Default;
+			}
+
+			if (_fontFont is not null)
+			{
+				_fontFont.Typeface = _font?.ToSKTypeface() ?? SKTypeface.Default;
+			}
 
 			_typefaceInvalid = false;
 		}
@@ -468,7 +475,7 @@ public void SetScale(float sx, float sy)
 
 		[Obsolete("Use Reset(SKPaint, SKFont, SKPaint, SKPaint) instead")]
 		public void Reset(SKPaint fontPaint, SKPaint fillPaint, SKPaint strokePaint)
-		{	
+		{
 			Reset(fontPaint, fontPaint?.ToFont(), fillPaint, strokePaint);
 		}