manual nui merge 0.2.38

[platform/core/csapi/nui.git] / Tizen.NUI / src / public / BaseComponents / TextEditor.cs

diff --git a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
old mode 100755 (executable)
new mode 100644 (file)
index 9c99be2..8f2a7a5
--- a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
+++ b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
@@ -170,11 +170,16 @@ namespace Tizen.NUI.BaseComponents
 
             ~Property()
             {
-                Dispose();
+                DisposeQueue.Instance.Add(this);
             }
 
             public virtual void Dispose()
             {
+                if (!Window.IsInstalled()) {
+                    DisposeQueue.Instance.Add(this);
+                    return;
+                }
+
                 lock (this)
                 {
                     if (swigCPtr.Handle != global::System.IntPtr.Zero)
@@ -256,11 +261,16 @@ namespace Tizen.NUI.BaseComponents
 
             ~InputStyle()
             {
-                Dispose();
+                DisposeQueue.Instance.Add(this);
             }
 
             public virtual void Dispose()
             {
+                if (!Window.IsInstalled()) {
+                    DisposeQueue.Instance.Add(this);
+                    return;
+                }
+
                 lock (this)
                 {
                     if (swigCPtr.Handle != global::System.IntPtr.Zero)