Merge branch 'master' into managed-file-dialog

7 years ago · 44a0dbd7ec
1 changed files with 1 additions and 1 deletions
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@ -318,7 +318,7 @@ namespace Avalonia.Controls

        private void DecideCaretVisibility()
        {
-            _presenter.ShowCaret();
+            _presenter?.ShowCaret();
        }

        protected override void OnLostFocus(RoutedEventArgs e)