[NUI] Fix NUI Manual TCT issue (#704)

Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>

diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs
index e1059d0c8893e3c777692bded8de07bbfd61e957..90dc8786d3958149a198c6c2126f34d1978991bf 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Application.cs
+++ b/src/Tizen.NUI/src/internal/Application.cs
@@ -1009,8 +1009,11 @@ namespace Tizen.NUI
                 e.Application = this;
                 _applicationTerminateEventHandler.Invoke(this, e);
             }
+            if (Window.Instance)
+            {
+                Window.Instance.DisconnectNativeSignals();
+            }
 
-            Window.Instance.DisconnectNativeSignals();
         }
 
         /**

diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs
index bc610a41ee24e6d38d11044022d2f2ad292a0617..542d513b6660188fc2bfba8a67e6509d9cd64cf0 100755 (executable)
--- a/src/Tizen.NUI/src/public/Window.cs
+++ b/src/Tizen.NUI/src/public/Window.cs
@@ -51,7 +51,7 @@ namespace Tizen.NUI
         private WindowResizedEventCallbackType _windowResizedEventCallback;
         private WindowFocusChangedEventCallbackType _windowFocusChangedEventCallback2;
 
-        private static readonly Window instance = Application.Instance.GetWindow();
+        private static readonly Window instance = Application.Instance?.GetWindow();
 
         internal Window(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Window_SWIGUpcast(cPtr), cMemoryOwn)
         {