Merge pull request #6429 from wieslawsoltes/AutoCompleteBoxNullRefere…

…nceFix Check if TextBox.Text is null in AutoCompleteBox
AvaloniaUI · Aug 16, 2021 · 8faa490 · 8faa490
2 parents 2234d55 + 08dea64
commit 8faa490
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Avalonia.Controls/AutoCompleteBox.cs b/src/Avalonia.Controls/AutoCompleteBox.cs
@@ -2005,7 +2005,7 @@ private void TextUpdated(string newText, bool userInitiated)
             // The TextBox.TextChanged event was not firing immediately and
             // was causing an immediate update, even with wrapping. If there is
             // a selection currently, no update should happen.
-            if (IsTextCompletionEnabled && TextBox != null && TextBoxSelectionLength > 0 && TextBoxSelectionStart != TextBox.Text.Length)
+            if (IsTextCompletionEnabled && TextBox != null && TextBoxSelectionLength > 0 && TextBoxSelectionStart != (TextBox.Text?.Length ?? 0))
             {
                 return;
             }
@@ -2303,7 +2303,7 @@ private void UpdateTextCompletion(bool userInitiated)
             {
                 if (IsTextCompletionEnabled && TextBox != null && userInitiated)
                 {
-                    int currentLength = TextBox.Text.Length;
+                    int currentLength = TextBox.Text?.Length ?? 0;
                     int selectionStart = TextBoxSelectionStart;
                     if (selectionStart == text.Length && selectionStart > _textSelectionStart)
                     {