Cheats, Lua, Ram Search/Watch - flag changes when adding a separator, default to SaveAs if saving a new file, allow Save in menu item in this scenario

This commit is contained in:
adelikat 2012-06-02 22:06:00 +00:00
parent 393dd9dcfe
commit 8ca6b24614
3 changed files with 13 additions and 9 deletions

View File

@ -519,6 +519,7 @@ namespace BizHawk.MultiClient
private void InsertSeparator()
{
Changes();
Cheat c = new Cheat();
c.address = -1;
@ -806,7 +807,7 @@ namespace BizHawk.MultiClient
private void fileToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{
if (string.Compare(Global.CheatList.currentCheatFile, "") == 0 || !Global.CheatList.Changes)
if (!Global.CheatList.Changes)
{
saveToolStripMenuItem.Enabled = false;
}

View File

@ -362,9 +362,9 @@ namespace BizHawk.MultiClient
{
if (changes)
{
if (string.Compare(currentSessionFile, "") == 0)
SaveAs();
else SaveSession(currentSessionFile);
if (string.Compare(currentSessionFile, "") == 0)
SaveAs();
else SaveSession(currentSessionFile);
Changes(false);
OutputMessages.Text = Path.GetFileName(currentSessionFile) + " saved.";
}
@ -968,7 +968,7 @@ namespace BizHawk.MultiClient
private void fileToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{
if (!changes || luaList.Count == 0)
if (!changes)
{
saveToolStripMenuItem.Enabled = false;
}

View File

@ -629,9 +629,11 @@ namespace BizHawk.MultiClient
private void saveToolStripMenuItem_Click(object sender, EventArgs e)
{
if (string.Compare(currentWatchFile, "") == 0) return;
if (changes)
if (string.Compare(currentWatchFile, "") == 0)
{
SaveAs();
}
else if (changes)
{
SaveWatchFile(currentWatchFile);
MessageLabel.Text = Path.GetFileName(currentWatchFile) + " saved.";
@ -741,7 +743,7 @@ namespace BizHawk.MultiClient
else
autoLoadToolStripMenuItem.Checked = false;
if (string.Compare(currentWatchFile, "") == 0 || !changes)
if (!changes)
{
saveToolStripMenuItem.Enabled = false;
}
@ -862,6 +864,7 @@ namespace BizHawk.MultiClient
private void InsertSeparator()
{
Changes();
Watch w = new Watch();
w.type = atype.SEPARATOR;