From af6141048083d456081d6c2a304eb8f160406d1d Mon Sep 17 00:00:00 2001
From: Fang Xiaohui <xiaohui.fang@samsung.com>
Date: Thu, 2 Dec 2021 11:04:19 +0800
Subject: [PATCH] [NUI] Fix failed in TCT

---
 src/Tizen.NUI.Components/Controls/Slider.cs                 | 2 +-
 src/Tizen.NUI.Components/Controls/SliderBindableProperty.cs | 5 +----
 src/Tizen.NUI.Components/Controls/Switch.cs                 | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Tizen.NUI.Components/Controls/Slider.cs b/src/Tizen.NUI.Components/Controls/Slider.cs
index 905a78b..5462213 100755
--- a/src/Tizen.NUI.Components/Controls/Slider.cs
+++ b/src/Tizen.NUI.Components/Controls/Slider.cs
@@ -602,7 +602,7 @@ namespace Tizen.NUI.Components
         }
         private StringSelector InternalThumbImageURLSelector
         {
-            get => thumbImage == null ? null : new StringSelector(thumbImage.ResourceUrlSelector);
+            get => thumbImage?.ResourceUrlSelector == null ? null : new StringSelector(thumbImage.ResourceUrlSelector);
             set
             {
                 if (value == null || thumbImage == null)
diff --git a/src/Tizen.NUI.Components/Controls/SliderBindableProperty.cs b/src/Tizen.NUI.Components/Controls/SliderBindableProperty.cs
index e0459cb..d11c2a5 100755
--- a/src/Tizen.NUI.Components/Controls/SliderBindableProperty.cs
+++ b/src/Tizen.NUI.Components/Controls/SliderBindableProperty.cs
@@ -103,10 +103,7 @@ namespace Tizen.NUI.Components
         public static readonly BindableProperty ThumbImageURLSelectorProperty = BindableProperty.Create(nameof(ThumbImageURLSelector), typeof(StringSelector), typeof(Slider), null, propertyChanged: (bindable, oldValue, newValue) =>
         {
             var instance = (Slider)bindable;
-            if (newValue != null)
-            {
-                instance.InternalThumbImageURLSelector = newValue as StringSelector;
-            }
+            instance.InternalThumbImageURLSelector = newValue as StringSelector;
         },
         defaultValueCreator: (bindable) =>
         {
diff --git a/src/Tizen.NUI.Components/Controls/Switch.cs b/src/Tizen.NUI.Components/Controls/Switch.cs
index 7430b1d..b6e3b0d 100755
--- a/src/Tizen.NUI.Components/Controls/Switch.cs
+++ b/src/Tizen.NUI.Components/Controls/Switch.cs
@@ -184,7 +184,7 @@ namespace Tizen.NUI.Components
         }
         private StringSelector InternalSwitchBackgroundImageURLSelector
         {
-            get => new StringSelector(Icon.ResourceUrlSelector);
+            get => Icon?.ResourceUrlSelector == null ? null : new StringSelector(Icon.ResourceUrlSelector);
             set
             {
                 Debug.Assert(Icon != null);
-- 
2.7.4