Merge pull request #220 from GreatFireWall/master

Fix ArgumentNullException issue.
icsharpcode · Feb 22, 2020 · 6200cab · 6200cab
2 parents e9df2d9 + 843b935
commit 6200cab
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/ICSharpCode.AvalonEdit/Search/SearchPanel.cs b/ICSharpCode.AvalonEdit/Search/SearchPanel.cs
@@ -272,10 +272,15 @@ void ValidateSearchText()
 		{
 			if (searchTextBox == null)
 				return;
+
 			var be = searchTextBox.GetBindingExpression(TextBox.TextProperty);
+
 			try {
-				Validation.ClearInvalid(be);
+				if (be != null)
+					Validation.ClearInvalid(be);
+
 				UpdateSearch();
+
 			} catch (SearchPatternException ex) {
 				var ve = new ValidationError(be.ParentBinding.ValidationRules[0], be, ex.Message, ex);
 				Validation.MarkInvalid(be, ve);