Fixed additional crash at launch when an incompatible module is used

BUTR · Mar 18, 2022 · c37bb99 · c37bb99
1 parent 2984f30
commit c37bb99
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/build/common.props b/build/common.props
@@ -3,7 +3,7 @@
 
   <!--Development Variables-->
   <PropertyGroup>
-    <Version>1.7.4</Version>
+    <Version>1.7.5</Version>
     <HarmonyVersion>2.0.4</HarmonyVersion>
     <BUTRSharedVersion>2.0.0.78</BUTRSharedVersion>
     <BUTRModuleManagerVersion>3.0.94</BUTRModuleManagerVersion>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.7.5
+Game Versions: e1.5.0,e1.5.1,e1.5.2,e1.5.3,e1.5.4,e1.5.5,e1.5.6,e1.5.7,e1.5.8,e1.5.9,e1.5.10,e1.6.0,e1.6.1,e1.6.2,e1.6.3,e1.6.4,e1.6.5,e1.7.0,e1.7.1,e1.7.2
+* Fixed additional crash at launch when an incompatible module is used
+---------------------------------------------------------------------------------------------------
 Version: 1.7.4
 Game Versions: e1.5.0,e1.5.1,e1.5.2,e1.5.3,e1.5.4,e1.5.5,e1.5.6,e1.5.7,e1.5.8,e1.5.9,e1.5.10,e1.6.0,e1.6.1,e1.6.2,e1.6.3,e1.6.4,e1.6.5,e1.7.0,e1.7.1,e1.7.2
 * Fixed crash at launch when an incompatible module is used

diff --git a/src/Bannerlord.BUTRLoader/Features/Interceptor/InterceptorFeature.cs b/src/Bannerlord.BUTRLoader/Features/Interceptor/InterceptorFeature.cs
@@ -25,8 +25,11 @@ static bool CheckType(Type type) => type.GetCustomAttributes()
                 IEnumerable<Type> enumerable;
                 try
                 {
-                    var types = assembly.GetTypes(); // Force type resolution
-                    enumerable = types.Where(CheckType);
+                    enumerable = assembly.GetTypes().Where(CheckType).ToArray(); // Force type resolution
+                }
+                catch (TypeLoadException)
+                {
+                    enumerable = Enumerable.Empty<Type>(); // ignore the incompatibility, not our problem
                 }
                 catch (ReflectionTypeLoadException)
                 {