Merge pull request #239 from sloutsky/textarea_automation_peer_fix

dgrunwald · web-flow · commit 6f24c1dd0a5a · 2020-06-24T21:11:51.000+02:00
Fix null-reference exception in TextAreaAutomationPeer
diff --git a/ICSharpCode.AvalonEdit/Editing/TextAreaAutomationPeer.cs b/ICSharpCode.AvalonEdit/Editing/TextAreaAutomationPeer.cs
@@ -114,8 +114,11 @@ public override object GetPattern(PatternInterface patternInterface)
 				return this;
 			if (patternInterface == PatternInterface.Scroll) {
 				TextEditor editor = TextArea.GetService(typeof(TextEditor)) as TextEditor;
-				if (editor != null)
-					return FromElement(editor).GetPattern(patternInterface);
+				if (editor != null) {
+					var fromElement = FromElement(editor);
+					if (fromElement != null)
+						return fromElement.GetPattern(patternInterface);
+				}
 			}
 			return base.GetPattern(patternInterface);
 		}

Original file line number	Diff line number	Diff line change
`@@ -114,8 +114,11 @@ public override object GetPattern(PatternInterface patternInterface)`
`114`	`114`	`return this;`
`115`	`115`	`if (patternInterface == PatternInterface.Scroll) {`
`116`	`116`	`TextEditor editor = TextArea.GetService(typeof(TextEditor)) as TextEditor;`
`117`		`- if (editor != null)`
`118`		`- return FromElement(editor).GetPattern(patternInterface);`
	`117`	`+ if (editor != null) {`
	`118`	`+ var fromElement = FromElement(editor);`
	`119`	`+ if (fromElement != null)`
	`120`	`+ return fromElement.GetPattern(patternInterface);`
	`121`	`+ }`
`119`	`122`	`}`
`120`	`123`	`return base.GetPattern(patternInterface);`
`121`	`124`	`}`