Merge pull request #115 from tonyroberts/develop-clean

tonyroberts · tonyroberts · commit 20e1d373b824 · 2016-01-08T10:58:38.000Z
Fix for 3dsMax Python
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -12,6 +12,7 @@
 using System.Collections;
 using System.Collections.Specialized;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Reflection;
 using System.Reflection.Emit;
 
@@ -57,10 +58,17 @@ internal static void Initialize() {
             domain.AssemblyResolve += rhandler;
 
             Assembly[] items = domain.GetAssemblies();
-            for (int i = 0; i < items.Length; i++) {
-                Assembly a = items[i];
-                assemblies.Add(a);
-                ScanAssembly(a);
+            foreach (var a in items)
+            {
+                try
+                {
+                    ScanAssembly(a);
+                    assemblies.Add(a);
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine(string.Format("Error scanning assembly {0}. {1}", a, ex));
+                }
             }
         }
 
@@ -316,9 +324,7 @@ internal static void ScanAssembly(Assembly assembly) {
                     for (int n = 0; n < names.Length; n++) {
                         s = (n == 0) ? names[0] : s + "." + names[n];
                         if (!namespaces.ContainsKey(s)) {
-                            namespaces.Add(s,
-                                           new Dictionary<Assembly, string>()
-                                           );
+                            namespaces.Add(s, new Dictionary<Assembly, string>());
                         }
                     }
                 }
