Fix a NRE in the UI if textures do not load

jcsnider · jcsnider · commit 8080bca8b688 · 2025-11-30T11:03:29.000-05:00
diff --git a/Intersect.Client.Framework/Gwen/Skin/Texturing/Bordered.cs b/Intersect.Client.Framework/Gwen/Skin/Texturing/Bordered.cs
@@ -1,4 +1,4 @@
-﻿using Intersect.Client.Framework.GenericClasses;
+using Intersect.Client.Framework.GenericClasses;
 using Intersect.Client.Framework.Graphics;
 
 namespace Intersect.Client.Framework.Gwen.Skin.Texturing;
@@ -185,7 +185,7 @@ public void Draw(Renderer.Base render, Rectangle r, Color col)
 
     public bool Equals(Bordered other)
     {
-        return _texture.Equals(other._texture) && _subRects.Equals(other._subRects) && _margin.Equals(other._margin) && _width.Equals(other._width) && _height.Equals(other._height);
+        return (_texture?.Equals(other._texture) ?? false) && _subRects.Equals(other._subRects) && _margin.Equals(other._margin) && _width.Equals(other._width) && _height.Equals(other._height);
     }
 
     public override bool Equals(object? obj)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Intersect.Client.Framework.GenericClasses;`
	`1`	`+using Intersect.Client.Framework.GenericClasses;`
`2`	`2`	`using Intersect.Client.Framework.Graphics;`
`3`	`3`
`4`	`4`	`namespace Intersect.Client.Framework.Gwen.Skin.Texturing;`
`@@ -185,7 +185,7 @@ public void Draw(Renderer.Base render, Rectangle r, Color col)`
`185`	`185`
`186`	`186`	`public bool Equals(Bordered other)`
`187`	`187`	`{`
`188`		`- return _texture.Equals(other._texture) && _subRects.Equals(other._subRects) && _margin.Equals(other._margin) && _width.Equals(other._width) && _height.Equals(other._height);`
	`188`	`+ return (_texture?.Equals(other._texture) ?? false) && _subRects.Equals(other._subRects) && _margin.Equals(other._margin) && _width.Equals(other._width) && _height.Equals(other._height);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`public override bool Equals(object? obj)`