From: huiyueun <35286162+huiyueun@users.noreply.github.com>
Date: Mon, 11 Feb 2019 06:56:34 +0000 (+0900)
Subject: [NUI] Fix NUI Manual TCT issue (#704)
X-Git-Tag: submit/tizen/20190212.000714~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fcb6d48c76e2dccb31082f83be3028bdabd24e8;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[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 e1059d0c8..90dc8786d 100755
--- 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 bc610a41e..542d513b6 100755
--- 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)
         {