Merge pull request #54 from DrCopyPaste/master

jogibear9988 · web-flow · commit fe42384390bb · 2021-08-09T12:24:03.000+02:00
only assign svgimage source if new value is not null
diff --git a/Source/SVGImage/SVG/SVGImage.cs b/Source/SVGImage/SVG/SVGImage.cs
@@ -728,8 +728,8 @@ static void OnSizeTypeChanged(DependencyObject d, DependencyPropertyChangedEvent
 
         static void OnSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            StreamResourceInfo resource = Application.GetResourceStream(new Uri(e.NewValue.ToString(), UriKind.Relative));
-            ((SVGImage)d).SetImage(resource.Stream);
+            StreamResourceInfo resource = e.NewValue != null ? Application.GetResourceStream(new Uri(e.NewValue.ToString(), UriKind.Relative)) : null;
+            ((SVGImage)d).SetImage(resource != null ? resource.Stream : null);
         }
 
         static void OnFileSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -728,8 +728,8 @@ static void OnSizeTypeChanged(DependencyObject d, DependencyPropertyChangedEvent`
`728`	`728`
`729`	`729`	`static void OnSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)`
`730`	`730`	`{`
`731`		`- StreamResourceInfo resource = Application.GetResourceStream(new Uri(e.NewValue.ToString(), UriKind.Relative));`
`732`		`- ((SVGImage)d).SetImage(resource.Stream);`
	`731`	`+ StreamResourceInfo resource = e.NewValue != null ? Application.GetResourceStream(new Uri(e.NewValue.ToString(), UriKind.Relative)) : null;`
	`732`	`+ ((SVGImage)d).SetImage(resource != null ? resource.Stream : null);`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`static void OnFileSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)`