Fix crash when attempting to draw a base node for a building that has a bib with an empty first frame

Author: Rampastring

src/TSMapEditor/Rendering/MapView.cs

@@ -1043,7 +1043,7 @@ private void DrawBaseNode(GraphicalBaseNode graphicalBaseNode)
             int yDrawOffset = Constants.CellSizeY / -2;
             int frameIndex = 0;
 
-            if ((graphics == null || graphics.GetFrame(frameIndex) == null) && bibGraphics == null)
+            if ((graphics == null || graphics.GetFrame(frameIndex) == null) && (bibGraphics == null || bibGraphics.GetFrame(0) == null))
             {
                 DrawStringWithShadow(iniName, 1, drawPoint.ToXNAVector(), replacementColor, 1.0f);
                 return;
@@ -1054,31 +1054,35 @@ private void DrawBaseNode(GraphicalBaseNode graphicalBaseNode)
             if (bibGraphics != null)
             {
                 PositionedTexture bibFrame = bibGraphics.GetFrame(0);
-                texture = bibFrame.Texture;
 
-                int bibFinalDrawPointX = drawPoint.X - bibFrame.ShapeWidth / 2 + bibFrame.OffsetX + Constants.CellSizeX / 2;
-                int bibFinalDrawPointY = drawPoint.Y - bibFrame.ShapeHeight / 2 + bibFrame.OffsetY + Constants.CellSizeY / 2 + yDrawOffset;
+                if (bibFrame != null && bibFrame.Texture != null)
+                {
+                    texture = bibFrame.Texture;
 
-                palettedColorDrawEffect.Parameters["UseRemap"].SetValue(false);
-                palettedColorDrawEffect.Parameters["PaletteTexture"].SetValue(bibGraphics.GetPaletteTexture(EditorState.IsLighting));
+                    int bibFinalDrawPointX = drawPoint.X - bibFrame.ShapeWidth / 2 + bibFrame.OffsetX + Constants.CellSizeX / 2;
+                    int bibFinalDrawPointY = drawPoint.Y - bibFrame.ShapeHeight / 2 + bibFrame.OffsetY + Constants.CellSizeY / 2 + yDrawOffset;
 
-                DrawTexture(texture, new Rectangle(
-                    bibFinalDrawPointX, bibFinalDrawPointY,
-                    texture.Width, texture.Height),
-                    null,nonRemapBaseNodeShade,
-                    0f, Vector2.Zero, SpriteEffects.None, 0f);
+                    palettedColorDrawEffect.Parameters["UseRemap"].SetValue(false);
+                    palettedColorDrawEffect.Parameters["PaletteTexture"].SetValue(bibGraphics.GetPaletteTexture(EditorState.IsLighting));
 
-                if (bibGraphics.HasRemapFrames())
-                {
-                    palettedColorDrawEffect.Parameters["UseRemap"].SetValue(true);
-                    DrawTexture(bibGraphics.GetRemapFrame(0).Texture,
-                        new Rectangle(bibFinalDrawPointX, bibFinalDrawPointY, texture.Width, texture.Height),
-                        null,
-                        remapColor,
-                        0f,
-                        Vector2.Zero,
-                        SpriteEffects.None,
-                        0f);
+                    DrawTexture(texture, new Rectangle(
+                        bibFinalDrawPointX, bibFinalDrawPointY,
+                        texture.Width, texture.Height),
+                        null, nonRemapBaseNodeShade,
+                        0f, Vector2.Zero, SpriteEffects.None, 0f);
+
+                    if (bibGraphics.HasRemapFrames())
+                    {
+                        palettedColorDrawEffect.Parameters["UseRemap"].SetValue(true);
+                        DrawTexture(bibGraphics.GetRemapFrame(0).Texture,
+                            new Rectangle(bibFinalDrawPointX, bibFinalDrawPointY, texture.Width, texture.Height),
+                            null,
+                            remapColor,
+                            0f,
+                            Vector2.Zero,
+                            SpriteEffects.None,
+                            0f);
+                    }
                 }
             }