From 8936b0b2d3a488fa69facbbd5b4c74746887fd20 Mon Sep 17 00:00:00 2001 From: Paul Hebble Date: Wed, 17 May 2023 22:16:11 -0500 Subject: [PATCH] Show download errors for upgrades --- GUI/Main/MainInstall.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/GUI/Main/MainInstall.cs b/GUI/Main/MainInstall.cs index 6eb7981593..f717ebd784 100644 --- a/GUI/Main/MainInstall.cs +++ b/GUI/Main/MainInstall.cs @@ -194,7 +194,9 @@ out Dictionary> supporters { // Get full changeset (toInstall only includes user's selections, not dependencies) var crit = CurrentInstance.VersionCriteria(); - var fullChangeset = new RelationshipResolver(toInstall, null, opts.Value, registry, crit).ModList().ToList(); + var fullChangeset = new RelationshipResolver( + toInstall.Concat(toUpgrade), toUninstall, opts.Value, registry, crit + ).ModList().ToList(); var dfd = new DownloadsFailedDialog( Properties.Resources.ModDownloadsFailedMessage, Properties.Resources.ModDownloadsFailedColHdr, @@ -203,7 +205,7 @@ out Dictionary> supporters fullChangeset.Where(m => m.download == kvp.Key.download).ToArray(), kvp.Value)), (m1, m2) => (m1 as CkanModule)?.download == (m2 as CkanModule)?.download); - Util.Invoke(this, () => dfd.ShowDialog(this)); + Util.Invoke(dfd, () => dfd.ShowDialog(this)); var skip = dfd.Wait()?.Select(m => m as CkanModule).ToArray(); var abort = dfd.Abort; dfd.Dispose();