diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b09bb0388..40cca794fc 100644 --- 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 index 27b8aea111..51210617e5 100644 --- a/Core/Registry/AvailableModule.cs +++ b/Core/Registry/AvailableModule.cs @@ -131,10 +131,10 @@ private static bool DependsAndConflictsOK(CkanModule module, IEnumerable 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