Manual merge for nui v0.2.34

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / internal / TimerSignalType.cs

diff --git a/src/Tizen.NUI/src/internal/TimerSignalType.cs b/src/Tizen.NUI/src/internal/TimerSignalType.cs
index 6b31a11..34b1d06 100755 (executable)
--- a/src/Tizen.NUI/src/internal/TimerSignalType.cs
+++ b/src/Tizen.NUI/src/internal/TimerSignalType.cs
@@ -25,10 +25,14 @@ namespace Tizen.NUI {
   }
 
   ~TimerSignalType() {
-    Dispose();
+    DisposeQueue.Instance.Add(this);
   }
 
   public virtual void Dispose() {
+    if (!Stage.IsInstalled()) {
+      DisposeQueue.Instance.Add(this);
+      return;
+    }
     lock(this) {
       if (swigCPtr.Handle != global::System.IntPtr.Zero) {
         if (swigCMemOwn) {