Merge branch 'fix-badimage' into develop

mntone · May 25, 2021 · 49ad470 · 49ad470
2 parents ee27ef8 + 879a52a
commit 49ad470
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/source/VirtualDesktop/Interop/ComInterfaceAssemblyProvider.cs b/source/VirtualDesktop/Interop/ComInterfaceAssemblyProvider.cs
@@ -57,14 +57,18 @@ private Assembly GetExistingAssembly()
 					if (int.TryParse(_assemblyRegex.Match(file.Name).Groups["build"]?.ToString(), out var build)
 						&& build == ProductInfo.OSBuild)
 					{
-						var name = AssemblyName.GetAssemblyName(file.FullName);
-						if (name.Version >= _requireVersion)
+						try
 						{
-							System.Diagnostics.Debug.WriteLine($"Assembly found: {file.FullName}");
+							var name = AssemblyName.GetAssemblyName(file.FullName);
+							if (name.Version >= _requireVersion)
+							{
+								System.Diagnostics.Debug.WriteLine($"Assembly found: {file.FullName}");
 #if !DEBUG
-							return Assembly.LoadFile(file.FullName);
+								return Assembly.LoadFile(file.FullName);
 #endif
+							}
 						}
+						catch (BadImageFormatException) { }
 					}
 				}
 			}