Skip to content

Commit efa45fd

Browse files
committed
Null checking is important
1 parent 702c5b5 commit efa45fd

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

SVGImage/SVGImage/SVG/SVGImage.cs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,22 @@ private static void CustomBrushesPropertyChanged(DependencyObject d, DependencyP
116116
{
117117
if (d is SVGImage svgImage && e.NewValue is Dictionary<string, Brush> newBrushes)
118118
{
119-
if (svgImage._render.CustomBrushes != null)
119+
if(svgImage._render != null)
120120
{
121-
Dictionary<string, Brush> newCustomBrushes = new Dictionary<string, Brush>(svgImage._render.CustomBrushes);
122-
foreach (var brush in newBrushes)
121+
if (svgImage._render.CustomBrushes != null)
123122
{
124-
newCustomBrushes[brush.Key] = brush.Value;
123+
Dictionary<string, Brush> newCustomBrushes = new Dictionary<string, Brush>(svgImage._render.CustomBrushes);
124+
foreach (var brush in newBrushes)
125+
{
126+
newCustomBrushes[brush.Key] = brush.Value;
127+
}
128+
svgImage._render.CustomBrushes = newCustomBrushes;
129+
}
130+
else
131+
{
132+
svgImage._render.CustomBrushes = newBrushes;
125133
}
126-
svgImage._render.CustomBrushes = newCustomBrushes;
127-
}
128-
else
129-
{
130-
svgImage._render.CustomBrushes = newBrushes;
131134
}
132-
133135
svgImage.InvalidateVisual();
134136
svgImage.ReRenderSvg();
135137
}

0 commit comments

Comments
 (0)