Merge pull request #7887 from ltetak/feature/skia_crash_on_exit

Suppress static SKFont finalizer to prevent crashes on app exit
AvaloniaUI · Mar 28, 2022 · 6507c4e · 6507c4e
2 parents bf8b8cd + adcc132
commit 6507c4e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs b/src/Skia/Avalonia.Skia/PlatformRenderInterface.cs
@@ -35,6 +35,9 @@ public PlatformRenderInterface(ISkiaGpu skiaGpu, long? maxResourceBytes = null)
             var gl = AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
             if (gl != null) 
                 _skiaGpu = new GlSkiaGpu(gl, maxResourceBytes);
+
+            //TODO: SKFont crashes when disposed in finalizer so we keep it alive
+            GC.SuppressFinalize(s_font);
         }
 
         public IGeometryImpl CreateEllipseGeometry(Rect rect) => new EllipseGeometryImpl(rect);