Merge #3840 Show download errors for upgrades

KSP-CKAN · May 18, 2023 · c5ba72c · c5ba72c
2 parents ac7bd71 + 8936b0b
commit c5ba72c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 - [GUI] Only update Versions tab when the mod changes (#3822 by: HebaruSan; reviewed: techman83)
 - [Multiple] Treat reinstalling a changed module as an update (#3828 by: HebaruSan; reviewed: techman83)
 - [Core] Scan for DLLs with or without primary mod dir (#3837 by: HebaruSan; reviewed: techman83)
+- [GUI] Show download errors for upgrades (#3840 by: HebaruSan; reviewed: techman83)
 
 ### Internal
 

diff --git a/GUI/Main/MainInstall.cs b/GUI/Main/MainInstall.cs
@@ -194,7 +194,9 @@ out Dictionary<CkanModule, HashSet<string>> 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<CkanModule, HashSet<string>> 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();