fix bug in SMS FM chip toggle ui code

This commit is contained in:
beirich 2011-02-15 03:05:25 +00:00
parent 2c4ef0ad55
commit 82be039bf7
2 changed files with 5 additions and 31 deletions

View File

@ -928,7 +928,6 @@
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "MainForm"; this.Name = "MainForm";
this.Text = "BizHawk"; this.Text = "BizHawk";
this.Load += new System.EventHandler(this.MainForm_Load);
this.menuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout(); this.menuStrip1.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);

View File

@ -681,29 +681,12 @@ namespace BizHawk.MultiClient
private void emulationToolStripMenuItem_DropDownOpened(object sender, EventArgs e) private void emulationToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{ {
if (IsNullEmulator()) powerToolStripMenuItem.Enabled = !IsNullEmulator();
{ resetToolStripMenuItem.Enabled = Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset");
powerToolStripMenuItem.Enabled = false;
}
else
{
powerToolStripMenuItem.Enabled = true;
}
if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset")) enableFMChipToolStripMenuItem.Checked = Global.Config.SmsEnableFM;
resetToolStripMenuItem.Enabled = true; overclockWhenKnownSafeToolStripMenuItem.Checked = Global.Config.SmsAllowOverlock;
else forceStereoSeparationToolStripMenuItem.Checked = Global.Config.SmsForceStereoSeparation;
resetToolStripMenuItem.Enabled = false;
if (Global.Config.SmsAllowOverlock)
overclockWhenKnownSafeToolStripMenuItem.Checked = true;
else
overclockWhenKnownSafeToolStripMenuItem.Checked = false;
if (Global.Config.SmsForceStereoSeparation)
forceStereoSeparationToolStripMenuItem.Checked = true;
else
forceStereoSeparationToolStripMenuItem.Checked = false;
} }
private void clearToolStripMenuItem_Click(object sender, EventArgs e) private void clearToolStripMenuItem_Click(object sender, EventArgs e)
@ -856,14 +839,6 @@ namespace BizHawk.MultiClient
LoadRamWatch(); LoadRamWatch();
} }
private void MainForm_Load(object sender, EventArgs e)
{
if (Global.Config.SmsEnableFM)
enableFMChipToolStripMenuItem.Checked = true;
else
enableFMChipToolStripMenuItem.Checked = false;
}
private void rAMSearchToolStripMenuItem_Click(object sender, EventArgs e) private void rAMSearchToolStripMenuItem_Click(object sender, EventArgs e)
{ {
LoadRamSearch(); LoadRamSearch();