Ensuring that Registry.Unregister is called from the most derived class before the...

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

diff --git a/Tizen.NUI/src/public/BaseHandle.cs b/Tizen.NUI/src/public/BaseHandle.cs
index 8ac41e0..848b995 100755 (executable)
--- a/Tizen.NUI/src/public/BaseHandle.cs
+++ b/Tizen.NUI/src/public/BaseHandle.cs
@@ -88,14 +88,15 @@ namespace Tizen.NUI
             //You should not access any managed member here except static instance.
             //because the execution order of Finalizes is non-deterministic.
 
-            //Unreference this instance from Registry.
-            Registry.Unregister(this);
-
             if (swigCPtr.Handle != global::System.IntPtr.Zero)
             {
                 if (swigCMemOwn)
                 {
                     swigCMemOwn = false;
+
+                    //Unreference this instance from Registry.
+                    Registry.Unregister(this);
+
                     NDalicPINVOKE.delete_BaseHandle(swigCPtr);
                 }
                 swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);