Fix NRE on purging cache in GUI

KSP-CKAN · Mar 11, 2023 · e7a385b · e7a385b
1 parent efb7fc8
commit e7a385b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/GUI/Controls/ManageMods.cs b/GUI/Controls/ManageMods.cs
@@ -1042,7 +1042,7 @@ private void purgeContentsToolStripMenuItem_Click(object sender, EventArgs e)
                     Main.Instance.Manager.Cache.Purge(mod);
                 }
                 selected.UpdateIsCached();
-                Main.Instance.UpdateModContentsTree(selected.ToCkanModule(), true);
+                Main.Instance.RefreshModContentsTree();
             }
         }
 

diff --git a/GUI/Controls/ModInfo.cs b/GUI/Controls/ModInfo.cs
@@ -42,9 +42,9 @@ public GUIMod SelectedModule
             get => selectedModule;
         }
 
-        public void UpdateModContentsTree(CkanModule module, bool force = false)
+        public void RefreshModContentsTree()
         {
-            Contents.UpdateModContentsTree(module, force);
+            Contents.Refresh();
         }
 
         public event Action<GUIMod>            OnDownloadClick;

diff --git a/GUI/Controls/ModInfoTabs/Contents.cs b/GUI/Controls/ModInfoTabs/Contents.cs
@@ -23,15 +23,18 @@ public GUIMod SelectedModule
                 if (value != selectedModule)
                 {
                     selectedModule = value;
-                    UpdateModContentsTree(selectedModule.ToModule());
+                    Util.Invoke(ContentsPreviewTree, () => _UpdateModContentsTree(selectedModule.ToModule()));
                 }
             }
             get => selectedModule;
         }
 
-        public void UpdateModContentsTree(CkanModule module, bool force = false)
+        public void Refresh()
         {
-            Util.Invoke(ContentsPreviewTree, () => _UpdateModContentsTree(module, force));
+            if (currentModContentsModule != null)
+            {
+                Util.Invoke(ContentsPreviewTree, () => _UpdateModContentsTree(currentModContentsModule, true));
+            }
         }
 
         public event Action<GUIMod> OnDownloadClick;

diff --git a/GUI/Dialogs/SettingsDialog.cs b/GUI/Dialogs/SettingsDialog.cs
@@ -264,7 +264,7 @@ private void PurgeAllMenuItem_Click(object sender, EventArgs e)
                 }
 
                 // finally, clear the preview contents list
-                Main.Instance.UpdateModContentsTree(null, true);
+                Main.Instance.RefreshModContentsTree();
 
                 UpdateCacheInfo(config.DownloadCacheDir);
             }

diff --git a/GUI/Main/Main.cs b/GUI/Main/Main.cs
@@ -503,9 +503,9 @@ private void SetupDefaultSearch()
             }
         }
 
-        public void UpdateModContentsTree(CkanModule module, bool force = false)
+        public void RefreshModContentsTree()
         {
-            ModInfo.UpdateModContentsTree(module, force);
+            ModInfo.RefreshModContentsTree();
         }
 
         private void ExitToolButton_Click(object sender, EventArgs e)

diff --git a/GUI/Main/MainDownload.cs b/GUI/Main/MainDownload.cs
@@ -88,7 +88,7 @@ private void _PostModCaching(GUIMod module)
             // Update mod list in case is:cached or not:cached filters are active
             RefreshModList();
             // User might have selected another row. Show current in tree.
-            UpdateModContentsTree(ModInfo.SelectedModule.ToCkanModule(), true);
+            RefreshModContentsTree();
         }
     }
 }