Merge pull request #352 from DomCR/image-base-fix

Image base fix
DomCR · Jun 2, 2024 · 276dc96 · 276dc96
2 parents 346445a + 399e94d
commit 276dc96
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/ACadSharp/Entities/CadImageBase.cs b/ACadSharp/Entities/CadImageBase.cs
@@ -200,12 +200,20 @@ internal override void AssignDocument(CadDocument doc)
 
 			this._definition = this.updateCollection(this.Definition, doc.ImageDefinitions);
 
-			this.Document.ImageDefinitions.OnRemove += this.imageDefinitionsOnRemove;
+			// The definitions entry is optional, some documents do not have it.
+			if (this.Document.ImageDefinitions != null)
+			{
+				this.Document.ImageDefinitions.OnRemove += this.imageDefinitionsOnRemove;
+			}
 		}
 
 		internal override void UnassignDocument()
 		{
-			this.Document.ImageDefinitions.OnRemove -= this.imageDefinitionsOnRemove;
+			// The definitions entry is optional, some documents do not have it.
+			if (this.Document.ImageDefinitions != null)
+			{
+				this.Document.ImageDefinitions.OnRemove -= this.imageDefinitionsOnRemove;
+			}
 
 			base.UnassignDocument();
 

diff --git a/CSUtilities b/CSUtilities