From 5d566f9356088e4618405194695190859dec7735 Mon Sep 17 00:00:00 2001
From: zhouleonlei <56956725+zhouleonlei@users.noreply.github.com>
Date: Tue, 2 Feb 2021 17:08:00 +0800
Subject: [PATCH] [NUI] Modify svace issues for NUI and wearable (#2600)

---
 src/Tizen.NUI.Wearable/src/internal/FishEyeLayoutManager.cs | 7 +++++--
 src/Tizen.NUI/src/public/Theme/Theme.cs                     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 src/Tizen.NUI/src/public/Theme/Theme.cs

diff --git a/src/Tizen.NUI.Wearable/src/internal/FishEyeLayoutManager.cs b/src/Tizen.NUI.Wearable/src/internal/FishEyeLayoutManager.cs
index 76e12a8..3d65eb6 100755
--- a/src/Tizen.NUI.Wearable/src/internal/FishEyeLayoutManager.cs
+++ b/src/Tizen.NUI.Wearable/src/internal/FishEyeLayoutManager.cs
@@ -96,8 +96,11 @@ namespace Tizen.NUI.Wearable
             {
                 FocusedIndex = Math.Max(0, FocusedIndex - 1);
                 centerItem = Container.Children[FocusedIndex] as RecycleItem;
-                centerItem.Position = new Position(0.0f, Math.Abs(StepSize * (centerItem.DataIndex)));
-                centerItem.Scale = new Vector3(1.0f, 1.0f, 1.0f);
+                if (centerItem != null)
+                {
+                    centerItem.Position = new Position(0.0f, Math.Abs(StepSize * (centerItem.DataIndex)));
+                    centerItem.Scale = new Vector3(1.0f, 1.0f, 1.0f);
+                }
             }
             else
             {
diff --git a/src/Tizen.NUI/src/public/Theme/Theme.cs b/src/Tizen.NUI/src/public/Theme/Theme.cs
old mode 100644
new mode 100755
index ab48b4e..ed077b6
--- a/src/Tizen.NUI/src/public/Theme/Theme.cs
+++ b/src/Tizen.NUI/src/public/Theme/Theme.cs
@@ -250,7 +250,7 @@ namespace Tizen.NUI
                 }
                 else
                 {
-                    map[item.Key] = theme.GetStyle(item.Key).Clone();
+                    map[item.Key] = theme.GetStyle(item.Key)?.Clone();
                 }
             }
         }
-- 
2.7.4