Merge #3647 Only show DLL location error if installing DLL

KSP-CKAN · Aug 30, 2022 · eb1b5ea · eb1b5ea
2 parents 7022058 + ce658d1
commit eb1b5ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
 - [GUI] Auto-size buttons in bottom panels (#3576 by: HebaruSan; reviewed: techman83)
 - [GUI] Hide tray icon at exit via ctrl-C (#3639 by: HebaruSan; reviewed: techman83)
 - [Multiple] Fix auto removal when installing w/ deps (#3643 by: HebaruSan; reviewed: techman83)
+- [Core] Only show DLL location error if installing DLL (#3647 by: HebaruSan; reviewed: techman83)
 
 ### Internal
 

diff --git a/Core/ModuleInstaller.cs b/Core/ModuleInstaller.cs
@@ -374,7 +374,10 @@ private IEnumerable<string> InstallModule(CkanModule module, string zip_filename
                                     && f.destination.EndsWith(".dll", StringComparison.CurrentCultureIgnoreCase))
                             .Select(f => Path.GetDirectoryName(ksp.ToRelativeGameDir(f.destination)))
                             .ToHashSet();
-                        if (!dllFolders.Contains(Path.GetDirectoryName(dll)))
+                        // Make sure that the DLL is actually included in the install
+                        // (NearFutureElectrical, NearFutureElectrical-Core)
+                        if (dllFolders.Count > 0
+                            && !dllFolders.Contains(Path.GetDirectoryName(dll)))
                         {
                             // Manually installed DLL is somewhere else where we're not installing files,
                             // probable bad install, alert user and abort