Fix crash when refreshing an unexpanded node. Improve error logging.

jaquadro · Apr 1, 2014 · f3304f5 · f3304f5
1 parent 3e6240d
commit f3304f5
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 11 deletions.
diff --git a/NBTExplorer.Installer/Product.wxs b/NBTExplorer.Installer/Product.wxs
@@ -3,7 +3,7 @@
 	<Product Id="*" 
            Name="NBTExplorer" 
            Language="1033" 
-           Version="2.7.2.0" 
+           Version="2.7.3.0" 
            Manufacturer="Justin Aquadro" 
            UpgradeCode="0bfb1026-21f2-4552-ad71-ca90aae10a25">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />

diff --git a/NBTExplorer/Program.cs b/NBTExplorer/Program.cs
@@ -66,17 +66,48 @@ private static void ProcessException (Exception ex)
                 return;
             }
 
+            if (IsMissingNBTModel(ex)) {
+                MessageBox.Show("NBTExplorer could not find required assembly \"NBTModel.dll\".\n\nIf you obtained NBTExplorer from a ZIP distribution, make sure you've extracted NBTExplorer and all of its supporting files into another directory before running it.",
+                    "NBTExplorer failed to run", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Application.Exit();
+                return;
+            }
+
             StringBuilder errorText = new StringBuilder();
             errorText.AppendLine("NBTExplorer encountered the following exception while trying to run: " + ex.GetType().Name);
             errorText.AppendLine("Message: " + ex.Message);
 
-            while (ex.InnerException != null) {
-                ex = ex.InnerException;
+            Exception ix = ex;
+            while (ix.InnerException != null) {
+                ix = ix.InnerException;
                 errorText.AppendLine();
                 errorText.AppendLine("Caused by Inner Exception: " + ex.GetType().Name);
                 errorText.AppendLine("Message: " + ex.Message);
             }
 
+            try {
+                using (var writer = new StreamWriter("NBTExplorer.error.log", true)) {
+                    writer.WriteLine("NBTExplorer Error Report");
+                    writer.WriteLine(DateTime.Now);
+                    writer.WriteLine("-------");
+                    writer.WriteLine(errorText);
+                    writer.WriteLine("-------");
+
+                    ix = ex;
+                    while (ix != null) {
+                        writer.WriteLine(ex.StackTrace);
+                        writer.WriteLine("-------");
+                        ix = ix.InnerException;
+                    }
+
+                    writer.WriteLine();
+                }
+
+                errorText.AppendLine();
+                errorText.AppendLine("Additional error detail has been written to NBTExplorer.error.log");
+            }
+            catch { }
+
             MessageBox.Show(errorText.ToString(), "NBTExplorer failed to run", MessageBoxButtons.OK, MessageBoxIcon.Error);
             Application.Exit();
         }
@@ -93,5 +124,18 @@ private static bool IsMissingSubstrate (Exception ex)
 
             return false;
         }
+
+        private static bool IsMissingNBTModel (Exception ex)
+        {
+            if (ex is TypeInitializationException && ex.InnerException != null)
+                ex = ex.InnerException;
+            if (ex is FileNotFoundException) {
+                FileNotFoundException fileEx = ex as FileNotFoundException;
+                if (fileEx.FileName.Contains("NBTModel"))
+                    return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/NBTExplorer/Properties/AssemblyInfo.cs b/NBTExplorer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.7.2.0")]
-[assembly: AssemblyFileVersion("2.7.2.0")]
+[assembly: AssemblyVersion("2.7.3.0")]
+[assembly: AssemblyFileVersion("2.7.3.0")]
diff --git a/NBTModel/Data/Nodes/CubicRegionDataNode.cs b/NBTModel/Data/Nodes/CubicRegionDataNode.cs
@@ -91,7 +91,7 @@ public override bool RefreshNode ()
             Release();
             RestoreExpandSet(this, expandSet);
 
-            return true;
+            return expandSet != null;
         }
     }
 }
diff --git a/NBTModel/Data/Nodes/DataNode.cs b/NBTModel/Data/Nodes/DataNode.cs
@@ -231,6 +231,9 @@ protected Dictionary<string, object> BuildExpandSet (DataNode node)
 
         protected void RestoreExpandSet (DataNode node, Dictionary<string, object> expandSet)
         {
+            if (expandSet == null)
+                return;
+
             node.Expand();
 
             foreach (DataNode child in node.Nodes) {

diff --git a/NBTModel/Data/Nodes/DirectoryDataNode.cs b/NBTModel/Data/Nodes/DirectoryDataNode.cs
@@ -84,7 +84,7 @@ public override bool RefreshNode ()
             Release();
             RestoreExpandSet(this, expandSet);
 
-            return true;
+            return expandSet != null;
         }
     }
 }
diff --git a/NBTModel/Data/Nodes/NbtFileDataNode.cs b/NBTModel/Data/Nodes/NbtFileDataNode.cs
@@ -145,7 +145,7 @@ public override bool RefreshNode ()
             Release();
             RestoreExpandSet(this, expandSet);
 
-            return true;
+            return expandSet != null;
         }
 
         public override bool CanRenameNode

diff --git a/NBTModel/Data/Nodes/RegionFileDataNode.cs b/NBTModel/Data/Nodes/RegionFileDataNode.cs
@@ -106,7 +106,7 @@ public override bool RefreshNode ()
             Release();
             RestoreExpandSet(this, expandSet);
 
-            return true;
+            return expandSet != null;
         }
     }
 }
diff --git a/NBTModel/Properties/AssemblyInfo.cs b/NBTModel/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyFileVersion("1.0.1.0")]