From f107e76b735122a83868e35d8dd33d877984313c Mon Sep 17 00:00:00 2001
From: Jiyun Yang <ji.yang@samsung.com>
Date: Thu, 20 Jul 2023 16:25:53 +0900
Subject: [PATCH] [NUI] Remove RenderTask itself from the RenderTaskList when
 disposed

Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
---
 src/Tizen.NUI/src/internal/Common/RenderTask.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Tizen.NUI/src/internal/Common/RenderTask.cs b/src/Tizen.NUI/src/internal/Common/RenderTask.cs
index 47b82238453..0c126070b36 100755
--- a/src/Tizen.NUI/src/internal/Common/RenderTask.cs
+++ b/src/Tizen.NUI/src/internal/Common/RenderTask.cs
@@ -41,6 +41,21 @@ public static RenderTask GetRenderTaskFromPtr(global::System.IntPtr cPtr)
             return ret;
         }
 
+        protected override void Dispose(DisposeTypes type)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            foreach (var window in Application.GetWindowList())
+            {
+                window.GetRenderTaskList().RemoveTask(this);
+            }
+
+            base.Dispose(type);
+        }
+
         internal class Property
         {
             internal static readonly int ViewportPosition = Interop.RenderTask.ViewportPositionGet();