making sure native render and native element will be disposed (#36)

Geeksltd · Sep 3, 2024 · e4c9a8c · e4c9a8c
1 parent ddc2202
commit e4c9a8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Core/Native/Renderer.cs b/Core/Native/Renderer.cs
@@ -19,6 +19,7 @@ internal interface IRenderOrchestrator : IDisposable { Task<BaseNativeType> Rend
 
     public partial class Renderer : IDisposable
     {
+        INativeRenderer NativeRenderer;
         public View View { get; private set; }
         public Renderer(View view) => View = view;
         IRenderOrchestrator RenderOrchestrator;
@@ -35,9 +36,9 @@ internal BaseNativeType CreateFromNativeRenderer()
 
             rendererType = rendererType.GenericTypeArguments.Single();
 
-            var renderer = (INativeRenderer)rendererType.CreateInstance();
+            NativeRenderer = (INativeRenderer)rendererType.CreateInstance();
 
-            return renderer.Render(this).GetAlreadyCompletedResult();
+            return NativeRenderer.Render(this).GetAlreadyCompletedResult();
         }
 
         /// <summary>

diff --git a/Zebble/UWP/Renderer.cs b/Zebble/UWP/Renderer.cs
@@ -282,7 +282,9 @@ public void Dispose()
             NativeContainer = null;
             View = null;
 
+            NativeRenderer?.Dispose();
             (NativeElement as IDisposable)?.Dispose();
+            NativeRenderer = null;
             NativeElement = null;
 
 			GC.SuppressFinalize(this);