diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index a51e85f6d6..a783c3ca15 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -107,6 +107,7 @@ this.loadCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.previousSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.nextSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.closeROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -130,6 +131,7 @@ this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.openROMToolStripMenuItem, this.recentROMToolStripMenuItem, + this.closeROMToolStripMenuItem, this.advancedLoadToolStripMenuItem, this.toolStripMenuItem1, this.saveStateToolStripMenuItem, @@ -742,6 +744,13 @@ this.nextSlotToolStripMenuItem.Text = "Next Slot"; this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click); // + // closeROMToolStripMenuItem + // + this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; + this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.closeROMToolStripMenuItem.Text = "&Close ROM"; + this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -839,6 +848,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; private System.Windows.Forms.ToolStripMenuItem saveToCurrentSlotToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadCurrentSlotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem closeROMToolStripMenuItem; } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 719bd3ae28..f4d253b744 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -395,7 +395,7 @@ namespace BizHawk.MultiClient private void resetToolStripMenuItem_Click(object sender, EventArgs e) { - + } private void pauseToolStripMenuItem_Click(object sender, EventArgs e) @@ -548,5 +548,11 @@ namespace BizHawk.MultiClient { LoadState("QuickSave" + SaveSlot.ToString()); } + + private void closeROMToolStripMenuItem_Click(object sender, EventArgs e) + { + CloseGame(); + Global.Emulator = new NullEmulator(); + } } } \ No newline at end of file