Fix potential NullReferenceException in CompletionList.set_SelectedItem.

dgrunwald · dgrunwald · commit 7814eefdfd2f · 2014-11-13T20:55:36.000+01:00
diff --git a/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs b/ICSharpCode.AvalonEdit/CodeCompletion/CompletionList.cs
@@ -199,7 +199,8 @@ public ICompletionData SelectedItem {
 			set {
 				if (listBox == null && value != null)
 					ApplyTemplate();
-				listBox.SelectedItem = value;
+				if (listBox != null) // may still be null if ApplyTemplate fails, or if listBox and value both are null
+					listBox.SelectedItem = value;
 			}
 		}
 		

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,8 @@ public ICompletionData SelectedItem {`
`199`	`199`	`set {`
`200`	`200`	`if (listBox == null && value != null)`
`201`	`201`	`ApplyTemplate();`
`202`		`- listBox.SelectedItem = value;`
	`202`	`+ if (listBox != null) // may still be null if ApplyTemplate fails, or if listBox and value both are null`
	`203`	`+ listBox.SelectedItem = value;`
`203`	`204`	`}`
`204`	`205`	`}`
`205`	`206`