Fix PresenterPropertyChanged add handler

3 years ago · 013e9dd8f0
1 changed files with 4 additions and 4 deletions
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@ -812,14 +812,14 @@ namespace Avalonia.Controls
        {
            base.OnAttachedToVisualTree(e);

-            if (IsFocused)
+            if (_presenter != null)
            {
-                if(_presenter != null)
+                if (IsFocused)
                {
                    _presenter.ShowCaret();
-
-                    _presenter.PropertyChanged += PresenterPropertyChanged;
                }
+
+                _presenter.PropertyChanged += PresenterPropertyChanged;
            }
        }