Fix null adorners not being applied

3 years ago · 0a73d24177
1 changed files with 3 additions and 1 deletions
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@ -403,7 +403,9 @@ namespace Avalonia.Controls
                {
                    if (_focusAdorner == null)
                    {
-                        var template = GetValue(FocusAdornerProperty) ?? adornerLayer.DefaultFocusAdorner;
+                        var template = IsSet(FocusAdornerProperty)
+                            ? GetValue(FocusAdornerProperty)
+                            : adornerLayer.DefaultFocusAdorner;

                        if (template != null)
                        {