Allow totally incompatible modules in changeset

KSP-CKAN · Sep 14, 2019 · f9e1fa8 · f9e1fa8
1 parent 910d89b
commit f9e1fa8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/GUI/GUIMod.cs b/GUI/GUIMod.cs
@@ -288,29 +288,28 @@ public CkanModule ToModule()
 
         public IEnumerable<KeyValuePair<CkanModule, GUIModChangeType>> GetRequestedChanges()
         {
-            if (IsInstalled && !IsInstallChecked)
-            {
-                // Uninstall the version we have installed
-                yield return new KeyValuePair<CkanModule, GUIModChangeType>(InstalledMod.Module, GUIModChangeType.Remove);
-            }
-            else if (!IsInstalled && IsInstallChecked)
-            {
-                yield return new KeyValuePair<CkanModule, GUIModChangeType>(SelectedMod ?? Mod, GUIModChangeType.Install);
-            }
-            else if (IsInstalled && (IsInstallChecked && HasUpdate && IsUpgradeChecked))
+            bool selectedIsInstalled = SelectedMod?.Equals(InstalledMod?.Module)
+                ?? InstalledMod?.Module.Equals(SelectedMod)
+                // Both null
+                ?? true;
+            if (IsInstalled && (IsInstallChecked && HasUpdate && IsUpgradeChecked))
             {
                 yield return new KeyValuePair<CkanModule, GUIModChangeType>(Mod, GUIModChangeType.Update);
             }
             else if (IsReplaceChecked)
             {
                 yield return new KeyValuePair<CkanModule, GUIModChangeType>(Mod, GUIModChangeType.Replace);
             }
-            else if (IsInstalled
-                && SelectedMod != null
-                && !InstalledMod.Module.Equals(SelectedMod))
+            else if (!selectedIsInstalled)
             {
-                yield return new KeyValuePair<CkanModule, GUIModChangeType>(InstalledMod.Module, GUIModChangeType.Remove);
-                yield return new KeyValuePair<CkanModule, GUIModChangeType>(SelectedMod, GUIModChangeType.Install);
+                if (InstalledMod != null)
+                {
+                    yield return new KeyValuePair<CkanModule, GUIModChangeType>(InstalledMod.Module, GUIModChangeType.Remove);
+                }
+                if (SelectedMod != null)
+                {
+                    yield return new KeyValuePair<CkanModule, GUIModChangeType>(SelectedMod, GUIModChangeType.Install);
+                }
             }
         }
 

diff --git a/GUI/MainModList.cs b/GUI/MainModList.cs
@@ -1076,7 +1076,6 @@ public HashSet<ModChange> ComputeUserChangeSet(IRegistryQuerier registry)
                 ?? new InstalledModule[] {};
             return new HashSet<ModChange>(
                 Modules
-                    .Where(mod => mod.IsInstallable())
                     .SelectMany(mod => mod.GetRequestedChanges())
                     .Select(change => new ModChange(change.Key, change.Value, null))
                     .Union(removableAuto.Select(im => new ModChange(