inner exc

speckleworks · Oct 23, 2019 · 60a234d · 60a234d
1 parent 231066a
commit 60a234d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/AssemblyCatalogue.cs b/AssemblyCatalogue.cs
@@ -23,13 +23,7 @@ public class SpeckleKitLoader
 
     public SpeckleKitLoader( )
     {
-
-#if DEBUG
-      SpeckleKitsDirectory = System.Environment.GetFolderPath( System.Environment.SpecialFolder.LocalApplicationData ) + @"\SpeckleKitsDebug\";
-#else
       SpeckleKitsDirectory = System.Environment.GetFolderPath( System.Environment.SpecialFolder.LocalApplicationData ) + @"\SpeckleKits\";
-#endif
-
       SpeckleAssemblyName = typeof( SpeckleObject ).GetTypeInfo().Assembly.GetName();
       assemblies = new Lazy<IReadOnlyCollection<Assembly>>( GetAvailableAssemblies );
     }

diff --git a/Conversion/ConverterDeserialisation.cs b/Conversion/ConverterDeserialisation.cs
@@ -89,8 +89,8 @@ public static object Deserialise( SpeckleObject obj, object root = null, IEnumer
               catch ( Exception e )
               {
                 // to native method failed, try another one if present!
-                if(e is Data.SpeckleException)
-                  ex = e as Data.SpeckleException;
+                if(e.InnerException!=null && e.InnerException is Data.SpeckleException)
+                  ex = e.InnerException as Data.SpeckleException;
               }
             }