Merge #4143 Make X skip buttons in changelog work better for modpacks

CHANGELOG.md

@@ -11,7 +11,7 @@ All notable changes to this project will be documented in this file.
 - [Multiple] Alternate game command lines and Steam refactor (#4010, #4013, #4028 by: HebaruSan)
 - [Multiple] Recommendations usability improvements (#4025 by: HebaruSan)
 - [Multiple] Prompt for client upgrade when newer spec is found (#4026, #4057 by: HebaruSan)
-- [GUI] Ability to clear auto-installed flag from changeset tab (#4033 by: HebaruSan)
+- [GUI] Ability to clear auto-installed flag from changeset tab (#4033, #4143 by: HebaruSan)
 - [Multiple] New Crowdin updates (#4019 by: Olympic1, vinix38; reviewed: HebaruSan)
 - [Core] Support Windows KSP1 instances on Linux (#4044 by: HebaruSan)
 - [GUI] I18n updates from Crowdin (#4050 by: HebaruSan)

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);
             }
         }

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)