general error handling to stop people breaking everything horribly

Starstructor · Jan 30, 2014 · 0e39c2d · 0e39c2d
1 parent b4c5039
commit 0e39c2d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/Starstructor/Data/JsonParser.cs b/Starstructor/Data/JsonParser.cs
@@ -24,6 +24,7 @@ You should have received a copy of the GNU General Public License along
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Newtonsoft.Json;
@@ -54,7 +55,7 @@ public static T ParseJson<T>(string path)
             }
             catch (Exception e)
             {
-                Editor.Log.Write(e.Message);
+                Editor.Log.Write("Failed to parse file " + path + " because " + e.Message);
                 return default(T);
             }
         }
@@ -68,7 +69,7 @@ public static void SerializeJson<T>(string path, T obj)
             }
             catch (Exception e)
             {
-                Editor.Log.Write(e.Message);
+                Editor.Log.Write("Failed to save file " + path + " because " + e.Message);
                 MessageBox.Show("Failed to save file " + path + ", please try again! Consult the log file for more information.");
             }
         }

diff --git a/Starstructor/EditorAssets.cs b/Starstructor/EditorAssets.cs
@@ -191,6 +191,9 @@ private static void RefreshAssetsBackground(bool clearMap = true)
 
                     StarboundObject sbObject = JsonParser.ParseJson<StarboundObject>(file);
 
+                    if (sbObject == null)
+                        continue;
+
                     lock (m_objectMap)
                     {
                         m_objectMap[sbObject.ObjectName] = sbObject;
@@ -206,6 +209,9 @@ private static void RefreshAssetsBackground(bool clearMap = true)
 
                     StarboundMaterial sbMaterial = JsonParser.ParseJson<StarboundMaterial>(file);
 
+                    if (sbMaterial == null)
+                        continue;
+
                     lock (m_materialMap)
                     {
                         m_materialMap[sbMaterial.MaterialName] = sbMaterial;

diff --git a/Starstructor/GUI/MainWindow.cs b/Starstructor/GUI/MainWindow.cs
@@ -692,7 +692,9 @@ private void UpdateImageBox(bool resetZoom, bool resetCamera)
                 return;
             }
 
-            EditorMapPart part = GetSelectedPart();
+            EditorMapPart part = GetSelectedPart();
+
+            if (part == null) return;
 
             // If we're displaying the graphic map
             if (BottomBarGfxCombo.SelectedIndex == 0)

diff --git a/Starstructor/StarboundTypes/Objects/ObjectImageManager.cs b/Starstructor/StarboundTypes/Objects/ObjectImageManager.cs
@@ -98,7 +98,7 @@ public string GetFrameKey(string frame = "default", string colour = "default", s
 
         public Rectangle? GetImageFrame(string frame = "default", string colour = "default", string key = "default")
         {
-            if (m_image.ImageFile == null)
+            if (m_image == null || m_image.ImageFile == null)
                 return null;
 
             if (m_frames == null)

diff --git a/Starstructor/StarboundTypes/StarboundDungeon.cs b/Starstructor/StarboundTypes/StarboundDungeon.cs
@@ -82,9 +82,17 @@ public override void LoadParts(Editor parent)
                     Editor.Log.Write("  Layer image " + fileName + " loaded");
                 }
 
+                int width = part.Width*Editor.DEFAULT_GRID_FACTOR;
+                int height = part.Height*Editor.DEFAULT_GRID_FACTOR;
+
+                if (width <= 0)
+                    width = 1;
+
+                if (height <= 0)
+                    height = 1;
+
                 // Create the graphics image
-                part.GraphicsMap = new Bitmap(part.Width*Editor.DEFAULT_GRID_FACTOR,
-                    part.Height*Editor.DEFAULT_GRID_FACTOR, System.Drawing.Imaging.PixelFormat.Format32bppPArgb);
+                part.GraphicsMap = new Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppPArgb);
 
                 // Update the composite collision map, now that all layers have been loaded
                 part.UpdateCompositeCollisionMap();