From 9023932880b5af2575eb54b4379c753152780427 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= <jp_bruyere@hotmail.com>
Date: Thu, 18 Mar 2021 13:50:38 +0100
Subject: [PATCH] prevent SvgPicture to cause exception if picture not loaded

---
 Crow/Crow.csproj            |  4 ++--
 Crow/src/Fill/SvgPicture.cs | 15 ++++++++++-----
 Directory.Build.props       |  1 -
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Crow/Crow.csproj b/Crow/Crow.csproj
index f09f66dc..9cff5e2d 100644
--- a/Crow/Crow.csproj
+++ b/Crow/Crow.csproj
@@ -23,7 +23,7 @@
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>$(NoWarn);1591;1587;1570;1572;1573;1574</NoWarn>
-		<DefineConstants>_DESIGN_MODE;_MEASURE_TIME</DefineConstants>		
+		<DefineConstants>DESIGN_MODE;_MEASURE_TIME;_DEBUG_HIGHLIGHT_FOCUS</DefineConstants>		
 		<EnableDefaultItems>false</EnableDefaultItems>
 		<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
 		<!--<AllowUnsafeBlocks>true</AllowUnsafeBlocks>-->
@@ -51,7 +51,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Content Include="$(SolutionDir)Images\crow.png" Pack="true" PackagePath="" />
+		<Content Include="..\Images\crow.png" Pack="true" PackagePath="" />
 		<Compile Include="src\**\*.cs" Exclude="src\Mono.Cairo\NativeMethods-internal.cs" />
 		<EmbeddedResource Include="Templates\*.*">
 			<LogicalName>Crow.%(Filename).template</LogicalName>
diff --git a/Crow/src/Fill/SvgPicture.cs b/Crow/src/Fill/SvgPicture.cs
index 4f378be4..fcd5c4d2 100644
--- a/Crow/src/Fill/SvgPicture.cs
+++ b/Crow/src/Fill/SvgPicture.cs
@@ -27,17 +27,20 @@ namespace Crow
 		public SvgPicture (string path) : base(path) {}
 		#endregion
 
-		void load (Interface iFace)
-		{			
+		bool load (Interface iFace)
+		{
+			if (string.IsNullOrEmpty(Path))
+				return false;
 			if (iFace.sharedPictures.ContainsKey (Path)) {
 				sharedPicture sp = iFace.sharedPictures [Path];
 				hSVG = (Rsvg.Handle)sp.Data;
 				Dimensions = sp.Dims;
-				return;
+				return true;
 			}
 			using (Stream stream = iFace.GetStreamFromPath (Path))
 				load (stream);
 			iFace.sharedPictures [Path] = new sharedPicture (hSVG, Dimensions);
+			return true;
 		}
 		void load (Stream stream) {
 			using (BinaryReader sr = new BinaryReader (stream)) {
@@ -61,7 +64,8 @@ namespace Crow
 		public override void SetAsSource (Interface iFace, Context ctx, Rectangle bounds = default(Rectangle))
 		{
 			if (hSVG == null)
-				load (iFace);
+				if (!load (iFace))
+					return;
 
 			float widthRatio = 1f;
 			float heightRatio = 1f;
@@ -101,7 +105,8 @@ namespace Crow
 		public override void Paint (Interface iFace, Context gr, Rectangle rect, string subPart = "")
 		{
 			if (hSVG == null)
-				load (iFace);
+				if (!load (iFace))
+					return;
 
 			float widthRatio = 1f;
 			float heightRatio = 1f;
diff --git a/Directory.Build.props b/Directory.Build.props
index 89659e1d..650c49bd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
 		<OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
 		<IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)\</IntermediateOutputPath>
 		<License>MIT</License>
-- 
2.47.3