Merge pull request #255 from batzen/patch-1

Prevent null reference exception when rendering
icsharpcode · Mar 8, 2021 · a8d86c1 · a8d86c1
2 parents 15e564f + a046e2d
commit a8d86c1
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ICSharpCode.AvalonEdit/Folding/FoldingMarginMarker.cs b/ICSharpCode.AvalonEdit/Folding/FoldingMarginMarker.cs
@@ -68,6 +68,9 @@ protected override Size MeasureCore(Size availableSize)
 		protected override void OnRender(DrawingContext drawingContext)
 		{
 			FoldingMargin margin = VisualParent as FoldingMargin;
+			if (margin == null) {
+				return;
+			}
 			Pen activePen = new Pen(margin.SelectedFoldingMarkerBrush, 1);
 			Pen inactivePen = new Pen(margin.FoldingMarkerBrush, 1);
 			activePen.StartLineCap = inactivePen.StartLineCap = PenLineCap.Square;