Merge #4028 Fix exception on clicking Play before dropdown appears

KSP-CKAN · Feb 14, 2024 · 3e56d8e · 3e56d8e
2 parents 6c5bf1f + 88d79f5
commit 3e56d8e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file.
 
 - [Updater] Support dev builds for auto updater (#3997, #4008 by: HebaruSan)
 - [GUI] Sort mods satisfying the same recommendation by download count (#4007 by: HebaruSan)
-- [Multiple] Alternate game command lines and Steam refactor (#4010, #4013 by: HebaruSan)
+- [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 by: HebaruSan)
 

diff --git a/GUI/Controls/ManageMods.cs b/GUI/Controls/ManageMods.cs
@@ -554,8 +554,6 @@ private void _MarkModForUpdate(string identifier, bool value)
  private void LaunchGameToolStripMenuItem_MouseHover(object sender, EventArgs e)
  {
  var cmdLines = Main.Instance.configuration.CommandLines;
- LaunchGameToolStripMenuItem.Tag =
- LaunchGameToolStripMenuItem.ToolTipText = cmdLines.First();
  LaunchGameToolStripMenuItem.DropDownItems.Clear();
  LaunchGameToolStripMenuItem.DropDownItems.AddRange(
  cmdLines.Select(cmdLine => (ToolStripItem)

diff --git a/GUI/Main/Main.cs b/GUI/Main/Main.cs
@@ -937,11 +937,15 @@ private void openGameDirectoryToolStripMenuItem_Click(object sender, EventArgs e
 
  private void openGameToolStripMenuItem_Click(object sender, EventArgs e)
  {
- LaunchGame(configuration.CommandLines.First());
+ LaunchGame();
  }
 
- private void LaunchGame(string command)
+ private void LaunchGame(string command = null)
  {
+ if (string.IsNullOrEmpty(command))
+ {
+ command = configuration.CommandLines.First();
+ }
  var split = command.Split(' ');
  if (split.Length == 0)
  {