Merge #3434 Don't prompt user to choose conflicting modules

KSP-CKAN · Sep 27, 2021 · 83aad88 · 83aad88
2 parents 40eda03 + 5b0af47
commit 83aad88
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
 - [Multiple] Set GNOME single window property (#3425 by: HebaruSan; reviewed: DasSkelett)
 - [Multiple] Default install stanza multi-game support, catch missing install_to (#3441 by: HebaruSan; reviewed: DasSkelett)
 - [GUI] Escape ampersands in mod info abstract label (#3429 by: HebaruSan; reviewed: DasSkelett)
+- [Core] Don't prompt user to choose conflicting modules (#3434 by: HebaruSan; reviewed: DasSkelett)
 
 ### Internal
 

diff --git a/Core/Registry/AvailableModule.cs b/Core/Registry/AvailableModule.cs
@@ -131,10 +131,10 @@ private static bool DependsAndConflictsOK(CkanModule module, IEnumerable<CkanMod
                     }
                 }
             }
+            var othersMinusSelf = others.Where(m => m.identifier != module.identifier).Memoize();
             if (module.conflicts != null)
             {
                 // Skip self-conflicts (but catch other modules providing self)
-                var othersMinusSelf = others.Where(m => m.identifier != module.identifier).Memoize();
                 foreach (RelationshipDescriptor rel in module.conflicts)
                 {
                     // If any of the conflicts are present, fail
@@ -144,6 +144,21 @@ private static bool DependsAndConflictsOK(CkanModule module, IEnumerable<CkanMod
                     }
                 }
             }
+            // Check reverse conflicts so user isn't prompted to choose modules that will error out immediately
+            var selfArray = new CkanModule[] { module };
+            foreach (CkanModule other in othersMinusSelf)
+            {
+                if (other.conflicts != null)
+                {
+                    foreach (RelationshipDescriptor rel in other.conflicts)
+                    {
+                        if (rel.MatchesAny(selfArray, null, null))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
             return true;
         }