Merge #4303 Guard rail for clicking refresh with refresh already in p…

…rogress
KSP-CKAN · Feb 7, 2025 · 793869e · 793869e
2 parents 8ec3b2c + 3ea9665
commit 793869e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ All notable changes to this project will be documented in this file.
 - [Core] Fix cloning instances with shared stock files on Windows (#4297 by: HebaruSan)
 - [Core] Handle paths without DriveInfo (#4300 by: HebaruSan)
 - [GUI] Make versions tab non-interactive inside install flow (#4302 by: HebaruSan)
+- [GUI] Guard rail for clicking refresh with refresh already in progress (#4303 by: HebaruSan)
 
 ### Internal
 

diff --git a/GUI/Controls/Wait.cs b/GUI/Controls/Wait.cs
@@ -31,12 +31,15 @@ public void StartWaiting(Action<object?, DoWorkEventArgs?>             mainWork,
                                  bool                                          cancelable,
                                  object?                                       param)
         {
-            bgLogic   = mainWork;
-            postLogic = postWork;
-            Reset(cancelable);
-            ClearLog();
-            RetryEnabled = false;
-            bgWorker.RunWorkerAsync(param);
+            if (!Busy)
+            {
+                bgLogic   = mainWork;
+                postLogic = postWork;
+                Reset(cancelable);
+                ClearLog();
+                RetryEnabled = false;
+                bgWorker.RunWorkerAsync(param);
+            }
         }
 
         public event Action? OnRetry;

diff --git a/GUI/Main/MainRepo.cs b/GUI/Main/MainRepo.cs
@@ -217,9 +217,9 @@ private void PostUpdateRepo(object? sender, RunWorkerCompletedEventArgs? e)
                         break;
                 }
             }
-            else if (e?.Result is(RepositoryDataManager.UpdateResult updateResult,
-                                  Dictionary<string, bool>           oldModules,
-                                  bool                               refreshWithoutChanges))
+            else if (e?.Result is (RepositoryDataManager.UpdateResult updateResult,
+                                   Dictionary<string, bool>           oldModules,
+                                   bool                               refreshWithoutChanges))
             {
                 switch (updateResult)
                 {

diff --git a/GUI/Properties/Resources.resx b/GUI/Properties/Resources.resx
@@ -344,12 +344,14 @@ If you suspect a bug in the client: https://github.com/KSP-CKAN/CKAN/issues/new/
   <data name="MainRepoAutoRefreshPrompt" xml:space="preserve"><value>Would you like CKAN to refresh the mod list automatically every time it is loaded?
 
 You can refresh the mod list manually with the Refresh button at the top, and you can change this setting later in the Settings. If you disable automatic refreshes, it's a good idea to refresh every few days.</value></data>
-  <data name="MainRepoBalloonTipDetails" xml:space="preserve"><value>{0} update(s) available</value></data>
-  <data name="MainRepoBalloonTipTooltip" xml:space="preserve"><value>Click to upgrade</value></data>
+  <data name="MainRepoBalloonTipDetails" xml:space="preserve"><value>Updates available: {0}
+
+Click to install...</value></data>
+  <data name="MainRepoBalloonTipTooltip" xml:space="preserve"><value>Click to install updates</value></data>
   <data name="MainTrayIconResume" xml:space="preserve"><value>Resume</value></data>
   <data name="MainTrayIconPause" xml:space="preserve"><value>Pause</value></data>
   <data name="MainTrayNoUpdates" xml:space="preserve"><value>No available updates</value></data>
-  <data name="MainTrayUpdatesAvailable" xml:space="preserve"><value>{0} available update(s)</value></data>
+  <data name="MainTrayUpdatesAvailable" xml:space="preserve"><value>Updates available: {0}</value></data>
   <data name="MainWaitPleaseWait" xml:space="preserve"><value>Please wait</value></data>
   <data name="MainWaitDone" xml:space="preserve"><value>All done!</value></data>
   <data name="ManageGameInstancesNotValid" xml:space="preserve"><value>Directory {0} is not a valid game directory.</value></data>