X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-swig%2Fmanual%2Fcsharp%2FKeyboardPreFocusChangeSignal.cs;h=949dfb801919b4e0126eb3b58247ed82624895ca;hp=5980e96c389212266e4411f6edd07ab3131a0b28;hb=03679dd813c231a1243127f685dbeceef62e35c2;hpb=67a328eded4a3947c33ae10b57aab2a637f0631e

diff --git a/plugins/dali-swig/manual/csharp/KeyboardPreFocusChangeSignal.cs b/plugins/dali-swig/manual/csharp/KeyboardPreFocusChangeSignal.cs
index 5980e96..949dfb8 100644
--- a/plugins/dali-swig/manual/csharp/KeyboardPreFocusChangeSignal.cs
+++ b/plugins/dali-swig/manual/csharp/KeyboardPreFocusChangeSignal.cs
@@ -35,10 +35,15 @@ public class KeyboardPreFocusChangeSignal : global::System.IDisposable {
   }
 
   ~KeyboardPreFocusChangeSignal() {
-    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) {