Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow totally incompatible modules in changeset #2869

Merged
merged 1 commit into from
Sep 15, 2019
Merged

Allow totally incompatible modules in changeset #2869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions GUI/GUIMod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

Expand Down
1 change: 0 additions & 1 deletion GUI/MainModList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down