Manual merge for nui v0.2.34

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / public / VisualBase.cs

diff --git a/src/Tizen.NUI/src/public/VisualBase.cs b/src/Tizen.NUI/src/public/VisualBase.cs
index 990774f..155dca8 100755 (executable)
--- a/src/Tizen.NUI/src/public/VisualBase.cs
+++ b/src/Tizen.NUI/src/public/VisualBase.cs
@@ -33,11 +33,16 @@ namespace Tizen.NUI
 
         ~VisualBase()
         {
-            Dispose();
+            DisposeQueue.Instance.Add(this);
         }
 
         public override void Dispose()
         {
+            if (!Stage.IsInstalled())
+            {
+                DisposeQueue.Instance.Add(this);
+                return;
+            }
             lock (this)
             {
                 if (swigCPtr.Handle != global::System.IntPtr.Zero)