X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FTizen.NUI%2Fsrc%2Finternal%2FToggleButton.cs;h=b3f5ad1c3fed683a12759b7b23205382976ebe45;hb=9e9cb411c582074c7e039224225369112f2ef5b3;hp=ad8697aac5b4763d30eb6574d1a610235c62428c;hpb=65f01dbf71be6581a89bdc37fafe9a4f82c1f5ad;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

diff --git a/src/Tizen.NUI/src/internal/ToggleButton.cs b/src/Tizen.NUI/src/internal/ToggleButton.cs
index ad8697a..b3f5ad1 100755
--- a/src/Tizen.NUI/src/internal/ToggleButton.cs
+++ b/src/Tizen.NUI/src/internal/ToggleButton.cs
@@ -38,10 +38,14 @@ public class ToggleButton : Button {
   }
 
   ~ToggleButton() {
-    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) {
         if (swigCMemOwn) {