From 8034260ee002ec917bc711316753c5cb110a798f Mon Sep 17 00:00:00 2001
From: "huiyu.eun" <huiyu.eun@samsung.com>
Date: Wed, 7 Apr 2021 10:38:18 +0900
Subject: [PATCH] [NUI] Fix Window.Instance null issue

If call Window.Instance before initializing, Window.Instance is always null

Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
---
 src/Tizen.NUI/src/internal/Application/Application.cs | 16 +++++++++-------
 src/Tizen.NUI/src/public/Window/Window.cs             | 10 +---------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/Tizen.NUI/src/internal/Application/Application.cs b/src/Tizen.NUI/src/internal/Application/Application.cs
index 13f7aab..ab46101 100755
--- a/src/Tizen.NUI/src/internal/Application/Application.cs
+++ b/src/Tizen.NUI/src/internal/Application/Application.cs
@@ -490,8 +490,8 @@ namespace Tizen.NUI
                 appControlSignal = null;
             }
 
-            win?.Dispose();
-            win = null;
+            window?.Dispose();
+            window = null;
 
             base.Dispose(type);
         }
@@ -575,7 +575,7 @@ namespace Tizen.NUI
         private NUIApplicationAppControlEventCallbackDelegate applicationAppControlEventCallbackDelegate;
         private ApplicationControlSignal appControlSignal;
 
-        private Window win;
+        private Window window;
 
         /**
           * @brief Event for Initialized signal which can be used to subscribe/unsubscribe the event handler
@@ -613,6 +613,7 @@ namespace Tizen.NUI
         {
             // Initialize DisposeQueue Singleton class. This is also required to create DisposeQueue on main thread.
             DisposeQueue.Instance.Initialize();
+            Window.Instance = GetWindow();
 
             // Notify that the window is displayed to the app core.
             if (NUIApplication.IsPreload)
@@ -1259,14 +1260,15 @@ namespace Tizen.NUI
 
         public Window GetWindow()
         {
-            win = Registry.GetManagedBaseHandleFromNativePtr(Interop.Application.GetWindow(SwigCPtr)) as Window;
-            if (win == null)
+            if (window != null)
             {
-                win = new Window(Interop.Application.GetWindow(SwigCPtr), true);
+                return window;
             }
 
+            window = (Registry.GetManagedBaseHandleFromNativePtr(Interop.Application.GetWindow(SwigCPtr)) as Window) ?? new Window(Interop.Application.GetWindow(SwigCPtr), true);
+
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return win;
+            return window;
         }
 
         public static string GetResourcePath()
diff --git a/src/Tizen.NUI/src/public/Window/Window.cs b/src/Tizen.NUI/src/public/Window/Window.cs
index 2738663..db7bcaa 100755
--- a/src/Tizen.NUI/src/public/Window/Window.cs
+++ b/src/Tizen.NUI/src/public/Window/Window.cs
@@ -34,8 +34,6 @@ namespace Tizen.NUI
     /// <since_tizen> 3 </since_tizen>
     public partial class Window : BaseHandle
     {
-        private static readonly Window instance = Application.Instance?.GetWindow();
-
         private HandleRef stageCPtr;
         private Layer rootLayer;
         private string windowTitle;
@@ -264,13 +262,7 @@ namespace Tizen.NUI
         /// Gets the current window.<br />
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
-        public static Window Instance
-        {
-            get
-            {
-                return instance;
-            }
-        }
+        public static Window Instance { get; internal set; }
 
         /// <summary>
         /// Gets or sets a window type.
-- 
2.7.4