Added Dispose Queue bindings for missing C# classes

[platform/core/uifw/dali-toolkit.git] / plugins / dali-swig / manual / csharp / ViewWrapperImpl.cs

diff --git a/plugins/dali-swig/manual/csharp/ViewWrapperImpl.cs b/plugins/dali-swig/manual/csharp/ViewWrapperImpl.cs
index 68fcef1..358a6bb 100644 (file)
--- a/plugins/dali-swig/manual/csharp/ViewWrapperImpl.cs
+++ b/plugins/dali-swig/manual/csharp/ViewWrapperImpl.cs
@@ -110,11 +110,17 @@ namespace Dali
 
         ~ViewWrapperImpl()
         {
-            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)
@@ -308,7 +314,10 @@ namespace Dali
 
         private void DirectorOnPropertySet(int index, global::System.IntPtr propertyValue)
         {
-            OnPropertySet(index, new Property.Value(propertyValue, true));
+            if (OnPropertySet != null)
+            {
+                OnPropertySet(index, new Property.Value(propertyValue, true));
+            }
         }
 
         private void DirectorOnSizeSet(global::System.IntPtr targetSize)