Prevent crash when starting DynamoSandbox without ASM (#9210)

* Prevent crash when starting DynamoSandbox without ASM * Preserve existing path output behavior, add test case
DynamoDS · Dec 5, 2018 · 06ee93f · 06ee93f
1 parent b571489
commit 06ee93f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Tools/DynamoShapeManager/Preloader.cs b/src/Tools/DynamoShapeManager/Preloader.cs
@@ -139,7 +139,14 @@ public Preloader(string rootFolder, IEnumerable<Version> versions)
             shapeManagerPath = string.Empty; // Folder that contains ASM binaries.
             version = Utilities.GetInstalledAsmVersion2(versionList, ref shapeManagerPath, rootFolder);
 
-            var libGFolderName = string.Format("libg_{0}_{1}_{2}", version.Major, version.Minor, version.Build);
+            int major = 0, minor = 0, build = 0;
+            if (version != null)
+            {
+                major = version.Major;
+                minor = version.Minor;
+                build = version.Build;
+            }
+            var libGFolderName = string.Format("libg_{0}_{1}_{2}", major, minor, build);
             preloaderLocation = Path.Combine(rootFolder, libGFolderName);
             geometryFactoryPath = Path.Combine(preloaderLocation,
                 Utilities.GeometryFactoryAssembly);

diff --git a/test/DynamoCoreTests/libGPreloaderTests.cs b/test/DynamoCoreTests/libGPreloaderTests.cs
@@ -220,5 +220,13 @@ public void RemapPathShouldReturnEmptyStringForNullPath()
             var newPath = DynamoShapeManager.Utilities.RemapOldLibGPathToNewVersionPath(oldPath);
             Assert.AreEqual(string.Empty, newPath);
         }
+        [Test]
+        public void PreloaderThatDoesNotFindASMDoesNotThrow()
+        {
+            Assert.DoesNotThrow(() =>
+            {
+                var preloader = new Preloader(Path.GetTempPath(), new[] { new Version(999, 999, 999) });
+            });
+        }
     }
 }