Merge pull request #1899 from Garethp/#1898-Texture-NRE-Fix

Issue #1898: Prevent NREs when adding new Texture Page Items or Embedded textures
UnderminersTeam · Aug 31, 2024 · 69095cd · 69095cd
2 parents dc1e209 + 64a6b98
commit 69095cd
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/UndertaleModLib/Models/UndertaleEmbeddedTexture.cs b/UndertaleModLib/Models/UndertaleEmbeddedTexture.cs
@@ -316,21 +316,33 @@ public GMImage Image
         /// <summary>
         /// The width of the texture.
         /// </summary>
-        public int Width => _image.Width;
+        /// <remarks>
+        /// In the case of an invalid or missing image, this will always be <c>-1</c>.
+        /// </remarks>
+        public int Width => _image?.Width ?? -1;
 
         /// <summary>
         /// The height of the texture.
         /// </summary>
-        public int Height => _image.Height;
+        /// <remarks>
+        /// In the case of an invalid or missing image, this will always be <c>-1</c>.
+        /// </remarks>
+        public int Height => _image?.Height ?? -1;
 
         /// <summary>
         /// Whether this texture uses the QOI format.
         /// </summary>
+        /// <remarks>
+        /// In the case of an invalid or missing image, this will always be <see langword="false" />.
+        /// </remarks>
         public bool FormatQOI => _image.Format is GMImage.ImageFormat.Qoi or GMImage.ImageFormat.Bz2Qoi;
 
         /// <summary>
         /// Whether this texture uses the BZ2 format. (Always used in combination with QOI.)
         /// </summary>
+        /// <remarks>
+        /// In the case of an invalid or missing image, this will always be <see langword="false" />.
+        /// </remarks>
         public bool FormatBZ2 => _image.Format is GMImage.ImageFormat.Bz2Qoi;
 
         /// <summary>

diff --git a/UndertaleModTool/Editors/UndertaleEmbeddedTextureEditor.xaml.cs b/UndertaleModTool/Editors/UndertaleEmbeddedTextureEditor.xaml.cs
@@ -69,6 +69,12 @@ public UndertaleEmbeddedTextureEditor()
 
         private void UpdateImage(UndertaleEmbeddedTexture texture)
         {
+            if (texture.TextureData?.Image is null)
+            {
+                TexturePageImage.Source = null;
+                return;
+            }
+
             GMImage image = texture.TextureData.Image;
             BitmapSource bitmap = mainWindow.GetBitmapSourceForImage(image);
             TexturePageImage.Source = bitmap;
@@ -88,8 +94,13 @@ private void SwitchDataContext(object sender, DependencyPropertyChangedEventArgs
             {
                 _textureDataContext.PropertyChanged -= ReloadTextureImage;
             }
+
             _textureDataContext = texture.TextureData;
-            _textureDataContext.PropertyChanged += ReloadTextureImage;
+
+            if (_textureDataContext is not null)
+            {
+                _textureDataContext.PropertyChanged += ReloadTextureImage;
+            }
         }
 
         private void ReloadTextureImage(object sender, PropertyChangedEventArgs e)

diff --git a/UndertaleModTool/Editors/UndertaleTexturePageItemEditor.xaml.cs b/UndertaleModTool/Editors/UndertaleTexturePageItemEditor.xaml.cs
@@ -40,6 +40,13 @@ public UndertaleTexturePageItemEditor()
 
         private void UpdateImages(UndertaleTexturePageItem item)
         {
+            if (item.TexturePage?.TextureData?.Image is null)
+            {
+                ItemTextureBGImage.Source = null;
+                ItemTextureImage.Source = null;
+                return;
+            }
+
             GMImage image = item.TexturePage.TextureData.Image;
             BitmapSource bitmap = mainWindow.GetBitmapSourceForImage(image);
             ItemTextureBGImage.Source = bitmap;
@@ -68,8 +75,12 @@ private void SwitchDataContext(object sender, DependencyPropertyChangedEventArgs
             {
                 _textureDataContext.PropertyChanged -= ReloadTextureImage;
             }
-            _textureDataContext = item.TexturePage.TextureData;
-            _textureDataContext.PropertyChanged += ReloadTextureImage;
+
+            if (item.TexturePage?.TextureData is not null)
+            {
+                _textureDataContext = item.TexturePage.TextureData;
+                _textureDataContext.PropertyChanged += ReloadTextureImage;
+            }
         }
 
         private void ReloadTexturePage(object sender, PropertyChangedEventArgs e)