Make X skip buttons in changelog work better for modpacks

KSP-CKAN · Aug 5, 2024 · f2b71a7 · f2b71a7
1 parent 1327aee
commit f2b71a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/GUI/Controls/Changeset.cs b/GUI/Controls/Changeset.cs
@@ -79,6 +79,8 @@ private void ChangesGrid_CellClick(object sender, DataGridViewCellEventArgs e)
                 && row.Change.IsRemovable
                 && row.ConfirmUncheck())
             {
+                (ChangesGrid.DataSource as BindingList<ChangesetRow>)?.Remove(row);
+                changeset.Remove(row.Change);
                 OnRemoveItem?.Invoke(row.Change);
             }
         }

diff --git a/GUI/Controls/ManageMods.cs b/GUI/Controls/ManageMods.cs
@@ -963,7 +963,9 @@ private void guiModule_PropertyChanged(object sender, PropertyChangedEventArgs e
 
         public void RemoveChangesetItem(ModChange change)
         {
-            if (change.IsRemovable
+            if (currentChangeSet != null
+                && currentChangeSet.Contains(change)
+                && change.IsRemovable
                 && mainModList.full_list_of_mod_rows.TryGetValue(change.Mod.identifier,
                                                                  out DataGridViewRow row)
                 && row.Tag is GUIMod guiMod)