projects / platform / core / csapi / tizenfx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a5681f7)
[NUI] Fix svace issue
authorzhouleonlei <zhouleon.lei@samsung.com>
Mon, 13 Sep 2021 06:13:07 +0000 (14:13 +0800)
committerSeoyeon2Kim <34738918+Seoyeon2Kim@users.noreply.github.com>
Mon, 13 Sep 2021 07:33:23 +0000 (16:33 +0900)
src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs patch | blob | history

diff --git a/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs b/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs
index 3085f68..6c8c657 100755 (executable)
--- a/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs
+++ b/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs
@@ -138,7 +138,7 @@ namespace Tizen.NUI.Binding
                 implicitStyles.Add(implicitStyleProperty);
                 Target.SetDynamicResource(implicitStyleProperty, type.FullName);
                 type = type.GetTypeInfo().BaseType;
-                if (stopAtTypes.Contains(type))
+                if (type != null && stopAtTypes.Contains(type))
                     return;
             }
         }
Domain: Dotnet / Frameworks;