diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index de299c793d..6fda3ddccf 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -2141,29 +2141,18 @@ namespace BizHawk.Client.EmuHawk settingsMenuItem.Click += GenericCoreSettingsMenuItem_Click; GenericCoreSubMenu.DropDownItems.Add(settingsMenuItem); - var specializedTools = SpecializedTools - .Where(t => Tools.IsAvailable(t)) - .OrderBy(t => t.Name) - .ToList(); + var specializedTools = SpecializedTools.Where(Tools.IsAvailable).OrderBy(static t => t.Name).ToList(); + if (specializedTools.Count is 0) return; - if (specializedTools.Any()) + GenericCoreSubMenu.DropDownItems.Add(new ToolStripSeparator()); + foreach (var toolType in specializedTools) { - GenericCoreSubMenu.DropDownItems.Add(new ToolStripSeparator()); - foreach (var tool in specializedTools) + ToolStripMenuItem item = new() { - var dispName = tool.GetCustomAttribute().DisplayName; - var item = new ToolStripMenuItem - { - Text = "&" + dispName - }; - - item.Click += (o, e) => - { - Tools.Load(tool); - }; - - GenericCoreSubMenu.DropDownItems.Add(item); - } + Text = $"&{toolType.GetCustomAttribute().DisplayName}", + }; + item.Click += (_, _) => Tools.Load(toolType); + GenericCoreSubMenu.DropDownItems.Add(item); } }