diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index ae6913a74d..3e59867246 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -183,14 +183,14 @@ // this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; this.clearToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.clearToolStripMenuItem.Text = "Clear"; + this.clearToolStripMenuItem.Text = "&Clear"; this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); // // autoloadMostRecentToolStripMenuItem // this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem"; this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.autoloadMostRecentToolStripMenuItem.Text = "Autoload Most Recent"; + this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent"; this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click); // // closeROMToolStripMenuItem diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 09803b2749..69f4ca5da9 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -574,7 +574,7 @@ namespace BizHawk.MultiClient RecentRoms.Clear(); } - private void autoloadMostRecentToolStripMenuItem_Click(object sender, EventArgs e) + private void UpdateAutoLoadRecentRom() { if (AutoLoadMostRecentRom == true) { @@ -588,6 +588,11 @@ namespace BizHawk.MultiClient } } + private void autoloadMostRecentToolStripMenuItem_Click(object sender, EventArgs e) + { + UpdateAutoLoadRecentRom(); + } + private void fileToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { if (AutoLoadMostRecentRom == true) @@ -601,6 +606,7 @@ namespace BizHawk.MultiClient //Clear out recent Roms list //repopulate it with an up to date list recentROMToolStripMenuItem.DropDownItems.Clear(); + if (RecentRoms.IsEmpty()) { recentROMToolStripMenuItem.DropDownItems.Add("None"); @@ -616,7 +622,22 @@ namespace BizHawk.MultiClient recentROMToolStripMenuItem.DropDownItems.Add(item); //TODO: truncate this to a nice size } } - recentROMToolStripMenuItem.DropDownItems.Add("Clear"); + + recentROMToolStripMenuItem.DropDownItems.Add("-"); + + var clearitem = new ToolStripMenuItem(); + clearitem.Text = "&Clear"; + clearitem.Click += (o, ev) => RecentRoms.Clear(); + recentROMToolStripMenuItem.DropDownItems.Add(clearitem); + + var auto = new ToolStripMenuItem(); + auto.Text = "&Autoload Most Recent"; + auto.Click += (o, ev) => UpdateAutoLoadRecentRom(); + if (AutoLoadMostRecentRom == true) + auto.Checked = true; + else + auto.Checked = false; + recentROMToolStripMenuItem.DropDownItems.Add(auto); } } } \ No newline at end of file