Fix crash when adding components to a design (#282)

ekolis · Feb 3, 2024 · 68250f7 · 68250f7
1 parent c57ef8a
commit 68250f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/FrEee/Objects/Technology/MountedComponentTemplate.cs b/FrEee/Objects/Technology/MountedComponentTemplate.cs
@@ -359,7 +359,8 @@ public override bool Equals(object? obj)
 
 	public override int GetHashCode()
 	{
-		return HashCodeMasher.Mash(Container, ComponentTemplate, Mount);
+		// can't mash the container itself because that would cause a circular dependency on this template
+		return HashCodeMasher.Mash(Container?.ID, ComponentTemplate, Mount);
 	}
 
 	/// <summary>

diff --git a/FrEee/Utility/HashCodeMasher.cs b/FrEee/Utility/HashCodeMasher.cs
@@ -8,7 +8,7 @@ namespace FrEee.Utility;
 /// </summary>
 public static class HashCodeMasher
 {
-	public static int Mash(params object[] objs)
+	public static int Mash(params object?[] objs)
 	{
 		return MashList(objs);
 	}