[NUI] Fix some SVACE issues.
authorzhouhao <haozhou.zhou@samsung.com>
Fri, 5 Jan 2024 07:46:33 +0000 (15:46 +0800)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Mon, 8 Jan 2024 03:50:29 +0000 (12:50 +0900)
src/Tizen.NUI.Components/Controls/Slider.cs
src/Tizen.NUI.Components/Controls/Switch.cs
src/Tizen.NUI/src/internal/FrameBroker/FrameBrokerBase.cs

index 5b21df4..b1d3e64 100755 (executable)
@@ -553,7 +553,15 @@ namespace Tizen.NUI.Components
         }
         private StringSelector InternalThumbImageURLSelector
         {
-            get => thumbImage?.ResourceUrlSelector == null ? null : new StringSelector(thumbImage.ResourceUrlSelector);
+            get
+            {
+                Selector<string> resourceUrlSelector = thumbImage?.ResourceUrlSelector;
+                if(resourceUrlSelector != null)
+                {
+                    return new StringSelector(resourceUrlSelector);
+                }
+                return null;
+            }
             set
             {
                 if (value == null || thumbImage == null)
index 5caef32..df04c78 100755 (executable)
@@ -202,7 +202,15 @@ namespace Tizen.NUI.Components
         }
         private StringSelector InternalSwitchBackgroundImageURLSelector
         {
-            get => Icon?.ResourceUrlSelector == null ? null : new StringSelector(Icon.ResourceUrlSelector);
+            get
+            {
+                Selector<string> resourceUrlSelector = Icon?.ResourceUrlSelector;
+                if(resourceUrlSelector != null)
+                {
+                    return new StringSelector(resourceUrlSelector);
+                }
+                return null;
+            }
             set
             {
                 Debug.Assert(Icon != null);
@@ -257,7 +265,15 @@ namespace Tizen.NUI.Components
         }
         private StringSelector InternalSwitchHandlerImageURLSelector
         {
-            get => new StringSelector(thumb.ResourceUrlSelector);
+            get
+            {
+                Selector<string> resourceUrlSelector = thumb?.ResourceUrlSelector;
+                if (resourceUrlSelector != null)
+                {
+                    return new StringSelector(resourceUrlSelector);
+                }
+                return null;
+            }
             set
             {
                 Debug.Assert(thumb != null);
index a885179..9212314 100755 (executable)
@@ -112,8 +112,10 @@ namespace Tizen.NUI
             }
 
             Interop.FrameBroker.ErrorCode err;
-            err = Interop.FrameBroker.SendLaunchRequest(handle, appControl.SafeAppControlHandle, resultCallbackMaps[requestId], null, (IntPtr)requestId);
-
+            lock (resultCallbackMaps)
+            {
+                err = Interop.FrameBroker.SendLaunchRequest(handle, appControl.SafeAppControlHandle, resultCallbackMaps[requestId], null, (IntPtr)requestId);
+            }
             if (err != Interop.FrameBroker.ErrorCode.None)
             {
                 throw FrameBrokerBaseErrorFactory.GetException(err, "Failed to send launch request");