refactoring

wieslawsoltes · Mar 14, 2024 · e4f29f4 · e4f29f4
1 parent 101c86e
commit e4f29f4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/src/Avalonia.Svg.Skia/SvgCustomDrawOperation.cs b/src/Avalonia.Svg.Skia/SvgCustomDrawOperation.cs
@@ -28,27 +28,28 @@ public void Dispose()
 
     public void Render(ImmediateDrawingContext context)
     {
+        if (_svg == null)
+            return;
+
+
+        var leaseFeature = context.TryGetFeature<ISkiaSharpApiLeaseFeature>();
+        if (leaseFeature is null)
+        {
+            return;
+        }
+        using var lease = leaseFeature.Lease();
+        var canvas = lease?.SkCanvas;
+        if (canvas is null)
+        {
+            return;
+        }
         lock (_svg.Locker)
         {
-            if (_svg?.Picture is null)
-            {
-                return;
-            }
-
-            var leaseFeature = context.TryGetFeature<ISkiaSharpApiLeaseFeature>();
-            if (leaseFeature is null)
-            {
+            var picture = _svg.Picture;
+            if (picture is null)
                 return;
-            }
-            using var lease = leaseFeature.Lease();
-            var canvas = lease?.SkCanvas;
-            if (canvas is null)
-            {
-                return;
-            }
-
             canvas.Save();
-            canvas.DrawPicture(_svg.Picture);
+            canvas.DrawPicture(picture);
             canvas.Restore();
         }
     }

diff --git a/src/Svg.Skia/SKSvg.Model.cs b/src/Svg.Skia/SKSvg.Model.cs
@@ -253,8 +253,11 @@ private void Reset()
     {
         Model = null;
         Drawable = null;
-        Picture?.Dispose();
-        Picture = null;
+        lock (Locker)
+        {
+            Picture?.Dispose();
+            Picture = null;
+        }
     }
 
     public void Dispose()