Restore conflict highlights in changeset (#3948)

KSP-CKAN · Dec 14, 2023 · 0ffd613 · 0ffd613
1 parent a79f1c9
commit 0ffd613
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/GUI/Controls/ManageMods.cs b/GUI/Controls/ManageMods.cs
@@ -101,7 +101,7 @@ private List<string> SortColumns
         public event Action<List<ModChange>, Dictionary<GUIMod, string>> OnChangeSetChanged;
         public event Action OnRegistryChanged;
 
-        public event Action<List<ModChange>> StartChangeSet;
+        public event Action<List<ModChange>, Dictionary<GUIMod, string>> StartChangeSet;
         public event Action<IEnumerable<GUIMod>> LabelsAfterUpdate;
 
         private List<ModChange> ChangeSet
@@ -523,7 +523,7 @@ private void MarkAllUpdatesToolButton_Click(object sender, EventArgs e)
 
         private void ApplyToolButton_Click(object sender, EventArgs e)
         {
-            StartChangeSet?.Invoke(currentChangeSet);
+            StartChangeSet?.Invoke(currentChangeSet, Conflicts);
         }
 
         public void MarkModForUpdate(string identifier, bool value)
@@ -1054,7 +1054,7 @@ private void reinstallToolStripMenuItem_Click(object sender, EventArgs e)
                                                                module.version)
                                            ?? module,
                                    true)
-                });
+                }, null);
             }
         }
 
@@ -1672,8 +1672,8 @@ public bool AllowClose()
 
         public void InstanceUpdated()
         {
-            ChangeSet = null;
             Conflicts = null;
+            ChangeSet = null;
         }
 
         [ForbidGUICalls]

diff --git a/GUI/Main/Main.cs b/GUI/Main/Main.cs
@@ -826,7 +826,8 @@ private void ManageMods_OnChangeSetChanged(List<ModChange> changeset, Dictionary
                 tabController.ShowTab("ChangesetTabPage", 1, false);
                 UpdateChangesDialog(
                     changeset,
-                    conflicts.ToDictionary(item => item.Key.ToCkanModule(), item => item.Value));
+                    conflicts.ToDictionary(item => item.Key.ToCkanModule(),
+                                           item => item.Value));
                 auditRecommendationsMenuItem.Enabled = false;
             }
             else
@@ -982,9 +983,11 @@ private void GameExit(GameInstance inst)
         }
 
         // This is used by Reinstall
-        private void ManageMods_StartChangeSet(List<ModChange> changeset)
+        private void ManageMods_StartChangeSet(List<ModChange> changeset, Dictionary<GUIMod, string> conflicts)
         {
-            UpdateChangesDialog(changeset, null);
+            UpdateChangesDialog(changeset,
+                                conflicts?.ToDictionary(item => item.Key.ToCkanModule(),
+                                                        item => item.Value));
             tabController.ShowTab("ChangesetTabPage", 1);
         }