CP-40844 minor fixes/tidy up

Signed-off-by: Chris Lancaster <[email protected]>
CitrixChris · Oct 5, 2023 · 467c08b · 467c08b
1 parent beac450
commit 467c08b
Show file tree

Hide file tree

Showing 5 changed files with 499 additions and 908 deletions.
diff --git a/XenAdmin/Alerts/Types/ClientUpdateAlert.cs b/XenAdmin/Alerts/Types/ClientUpdateAlert.cs
@@ -166,7 +166,8 @@ public static void DownloadSource(IWin32Window parent)
             }
 
             var clientVersion = Updates.ClientVersions.FirstOrDefault();
-            if (clientVersion == null) { return; }
+            if (clientVersion == null) 
+                return;
             var sourceUrl = clientVersion.SourceUrl;
             var downloadSourceAction = new DownloadSourceAction(clientVersion.Name, clientVersion.Version, new Uri(sourceUrl), outputPathAndFileName);
 
@@ -177,22 +178,7 @@ public static void DownloadSource(IWin32Window parent)
             }
 
             if (!downloadSourceAction.Succeeded)
-                return;
-
-            bool currentTasks = false;
-            foreach (ActionBase a in ConnectionsManager.History)
-            {
-                if (a is MeddlingAction || a.IsCompleted)
-                    continue;
-
-                currentTasks = true;
-                break;
-            }
-
-            if (currentTasks && new Dialogs.WarningDialogs.CloseXenCenterWarningDialog(true).ShowDialog(parent) != DialogResult.OK)
-            {
-                downloadSourceAction.ReleaseDownloadedContent();               
-            }
+                return;            
         }
     }
 }
diff --git a/XenAdmin/MainWindow.cs b/XenAdmin/MainWindow.cs
@@ -2716,11 +2716,11 @@ private void SetClientUpdateAlert()
             if (updateAlert != null)
             {
                 relNotesToolStripMenuItem.Text = string.Format(Messages.MAINWINDOW_UPDATE_RELEASE, updateAlert.NewVersion.Version);
-                downloadLatestSourceToolStripMenuItem.Text = string.Format(Messages.DOWNLOAD_SOURCE, updateAlert.NewVersion.Version);
+                downloadSourceToolStripMenuItem.Text = string.Format(Messages.DOWNLOAD_SOURCE, updateAlert.NewVersion.Version);
             }
-            var clientVersion = Updates.ClientVersions.FirstOrDefault();
-            downloadSourceToolStripMenuItem.Visible = clientVersion != null;
-            downloadSourceToolStripMenuItem.Text = clientVersion != null
+            var clientVersion = Updates.ClientVersions.FirstOrDefault();            
+            downloadLatestSourceToolStripMenuItem.Visible = clientVersion != null;
+            downloadLatestSourceToolStripMenuItem.Text = clientVersion != null
                 ? string.Format(Messages.DOWNLOAD_SOURCE, clientVersion.Version)
                 : string.Empty;
             updateClientToolStripMenuItem.Visible = updateAlert != null;