[NUI] Sync with dalihub (#693)

[platform/core/csapi/tizenfx.git] / src / Tizen.NUI / src / internal / XamlBinding / ResourcesExtensions.cs

diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ResourcesExtensions.cs b/src/Tizen.NUI/src/internal/XamlBinding/ResourcesExtensions.cs
index 84eeaf3..b4cd21a 100755 (executable)
--- a/src/Tizen.NUI/src/internal/XamlBinding/ResourcesExtensions.cs
+++ b/src/Tizen.NUI/src/internal/XamlBinding/ResourcesExtensions.cs
@@ -14,6 +14,8 @@ namespace Tizen.NUI.Binding
                 if (ve != null && ve.IsResourcesCreated)
                 {
                     resources = resources ?? new Dictionary<string, object>();
+                    if (ve.XamlResources != null)
+                    {
                     foreach (KeyValuePair<string, object> res in ve.XamlResources.MergedResources)
                         if (!resources.ContainsKey(res.Key))
                             resources.Add(res.Key, res.Value);
@@ -24,6 +26,7 @@ namespace Tizen.NUI.Binding
                             resources[res.Key] = mergedClassStyles;
                         }
                 }
+                }
                 var app = element as Application;
                 if (app != null && app.SystemResources != null)
                 {
@@ -48,11 +51,15 @@ namespace Tizen.NUI.Binding
             while (element != null)
             {
                 var ve = element as IResourcesProvider;
-                if (ve != null && ve.IsResourcesCreated && ve.XamlResources.TryGetValue(key, out value))
+                if (ve != null && ve.IsResourcesCreated && ve.XamlResources != null && ve.XamlResources.TryGetValue(key, out value))
+                {
                     return true;
+                }
                 var app = element as Application;
                 if (app != null && app.SystemResources != null && app.SystemResources.TryGetValue(key, out value))
+                {
                     return true;
+                }
                 element = element.Parent;
             }