Merge pull request #360 from IvaYan/master

Fix NRE on losing focus #359
AvaloniaUI · Jul 19, 2023 · e9cb45e · e9cb45e
2 parents 02b4ebd + 1a2a644
commit e9cb45e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/AvaloniaEdit/Editing/TextArea.cs b/src/AvaloniaEdit/Editing/TextArea.cs
@@ -1192,7 +1192,12 @@ public override string SurroundingText
 
             public override TextSelection Selection
             {
-                get => new TextSelection(_textArea.Caret.Position.Column, _textArea.Caret.Position.Column + _textArea.Selection.Length);
+                get
+                {
+                    if (_textArea == null)
+                        return new TextSelection(0, 0);
+                    return new TextSelection(_textArea.Caret.Position.Column, _textArea.Caret.Position.Column + _textArea.Selection.Length);
+                }
                 set
                 {
                     var selection = _textArea.Selection;