From: huiyueun <35286162+huiyueun@users.noreply.github.com>
Date: Thu, 31 Jan 2019 05:09:59 +0000 (+0900)
Subject: [NUI] Fix VD Svace issue (#696)
X-Git-Tag: submit/tizen_5.0/20190131.051359~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=370af08d1641d1a1de634ddd832f894946b4eac5;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[NUI] Fix VD Svace issue (#696)

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

diff --git a/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs b/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs
index ce953613a..cdc919b6b 100755
--- a/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs
+++ b/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs
@@ -315,7 +315,7 @@ namespace Tizen.NUI.Xaml
                         enode.SkipProperties.Add(name);
                     var value = Context.Values[node];
                     var serviceProvider = new XamlServiceProvider(enode, Context);
-                    var convertedValue = value.ConvertTo(parameter.ParameterType, () => parameter, serviceProvider);
+                    var convertedValue = value?.ConvertTo(parameter.ParameterType, () => parameter, serviceProvider);
                     array[i] = convertedValue;
                 }
     
diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs b/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs
index adcc0685b..57a975b47 100755
--- a/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs
+++ b/src/Tizen.NUI/src/internal/XamlBinding/Interactivity/XamlPropertyCondition.cs
@@ -28,13 +28,14 @@ namespace Tizen.NUI.Binding
                     return;
                 if (IsSealed)
                     throw new InvalidOperationException("Can not change Property once the Trigger has been applied.");
+
                 _property = value;
 
                 //convert the value
                 if (_property != null && s_valueConverter != null)
                 {
-                    Func<MemberInfo> minforetriever = () => Property.DeclaringType.GetRuntimeProperty(Property.PropertyName);
-                    Value = s_valueConverter.Convert(Value, Property.ReturnType, minforetriever, null);
+                    Func<MemberInfo> minforetriever = () => _property.DeclaringType.GetRuntimeProperty(_property.PropertyName);
+                    Value = s_valueConverter.Convert(Value, _property.ReturnType, minforetriever, null);
                 }
             }
         }
@@ -52,8 +53,8 @@ namespace Tizen.NUI.Binding
                 //convert the value
                 if (_property != null && s_valueConverter != null)
                 {
-                    Func<MemberInfo> minforetriever = () => Property.DeclaringType.GetRuntimeProperty(Property.PropertyName);
-                    value = s_valueConverter.Convert(value, Property.ReturnType, minforetriever, null);
+                    Func<MemberInfo> minforetriever = () => _property.DeclaringType.GetRuntimeProperty(_property.PropertyName);
+                    value = s_valueConverter.Convert(value, _property.ReturnType, minforetriever, null);
                 }
                 _triggerValue = value;
             }
diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs
index 976471a0e..51099a4b5 100755
--- a/src/Tizen.NUI/src/public/Window.cs
+++ b/src/Tizen.NUI/src/public/Window.cs
@@ -686,7 +686,7 @@ namespace Tizen.NUI
         {
             if (depth < LayersChildren?.Count)
             {
-                Layer ret = LayersChildren[Convert.ToInt32(depth)];
+                Layer ret = LayersChildren?[Convert.ToInt32(depth)];
                 return ret;
             }
             else