Ram Watch - implement restart method

This commit is contained in:
andres.delikat 2011-04-21 00:39:14 +00:00
parent c76f9ed729
commit 3007cd73cb
2 changed files with 12 additions and 5 deletions

View File

@ -609,6 +609,7 @@ namespace BizHawk.MultiClient
SetSpeedPercent(Global.Config.SpeedPercent); SetSpeedPercent(Global.Config.SpeedPercent);
} }
RamSearch1.Restart(); RamSearch1.Restart();
RamWatch1.Restart();
HexEditor1.Restart(); HexEditor1.Restart();
NESPPU1.Restart(); NESPPU1.Restart();
NESNameTableViewer1.Restart(); NESNameTableViewer1.Restart();
@ -1489,6 +1490,7 @@ namespace BizHawk.MultiClient
Global.Emulator = new NullEmulator(); Global.Emulator = new NullEmulator();
Global.Game = null; Global.Game = null;
RamSearch1.Restart(); RamSearch1.Restart();
RamWatch1.Restart();
HexEditor1.Restart(); HexEditor1.Restart();
NESPPU1.Restart(); NESPPU1.Restart();
NESNameTableViewer1.Restart(); NESNameTableViewer1.Restart();

View File

@ -17,7 +17,6 @@ namespace BizHawk.MultiClient
public partial class RamWatch : Form public partial class RamWatch : Form
{ {
//TODO: //TODO:
//Restart() method to be called in main
//Restore window size should restore column order as well //Restore window size should restore column order as well
//When receiving a watch from a different domain, should something be done? //When receiving a watch from a different domain, should something be done?
@ -36,6 +35,12 @@ namespace BizHawk.MultiClient
bool changes = false; bool changes = false;
List<ToolStripMenuItem> domainMenuItems = new List<ToolStripMenuItem>(); List<ToolStripMenuItem> domainMenuItems = new List<ToolStripMenuItem>();
public void Restart()
{
if (!this.IsHandleCreated || this.IsDisposed) return;
NewWatchList(true);
}
public List<Watch> GetRamWatchList() public List<Watch> GetRamWatchList()
{ {
List<Watch> w = new List<Watch>(); List<Watch> w = new List<Watch>();
@ -289,12 +294,12 @@ namespace BizHawk.MultiClient
} }
} }
private void NewWatchList() private void NewWatchList(bool suppressAsk)
{ {
bool result = true; bool result = true;
if (changes) result = AskSave(); if (changes) result = AskSave();
if (result == true) if (result == true || suppressAsk)
{ {
watchList.Clear(); watchList.Clear();
DisplayWatchList(); DisplayWatchList();
@ -573,7 +578,7 @@ namespace BizHawk.MultiClient
private void newListToolStripMenuItem_Click(object sender, EventArgs e) private void newListToolStripMenuItem_Click(object sender, EventArgs e)
{ {
NewWatchList(); NewWatchList(false);
} }
private FileInfo GetFileFromUser() private FileInfo GetFileFromUser()
@ -807,7 +812,7 @@ namespace BizHawk.MultiClient
private void newToolStripButton_Click(object sender, EventArgs e) private void newToolStripButton_Click(object sender, EventArgs e)
{ {
NewWatchList(); NewWatchList(false);
} }
private void openToolStripButton_Click(object sender, EventArgs e) private void openToolStripButton_Click(object sender, EventArgs e)