diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 6aef8cf78e..7425e114a3 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -252,6 +252,7 @@ namespace BizHawk.MultiClient Global.Emulator = new NullEmulator(); RamSearch1.Restart(); HexEditor1.Restart(); + NESPPU1.Restart(); Text = "BizHawk"; HandlePlatformMenus(""); } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index c3c664b98a..ec0c8c1b87 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -515,6 +515,7 @@ namespace BizHawk.MultiClient } RamSearch1.Restart(); HexEditor1.Restart(); + NESPPU1.Restart(); CurrentlyOpenRom = path; return true; } diff --git a/BizHawk.MultiClient/NEStools/NESPPU.cs b/BizHawk.MultiClient/NEStools/NESPPU.cs index dc01fe715a..820667b6eb 100644 --- a/BizHawk.MultiClient/NEStools/NESPPU.cs +++ b/BizHawk.MultiClient/NEStools/NESPPU.cs @@ -14,6 +14,7 @@ namespace BizHawk.MultiClient { int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired int defaultHeight; + NES Nes; public NESPPU() { @@ -27,6 +28,12 @@ namespace BizHawk.MultiClient Global.Config.NESPPUWndy = this.Location.Y; } + public void Restart() + { + if (!(Global.Emulator is NES)) this.Close(); + Nes = Global.Emulator as NES; + } + private void LoadConfigSettings() { defaultWidth = Size.Width; //Save these first so that the user can restore to its original size @@ -34,7 +41,6 @@ namespace BizHawk.MultiClient if (Global.Config.NESPPUWndx >= 0 && Global.Config.NESPPUWndy >= 0) Location = new Point(Global.Config.NESPPUWndx, Global.Config.NESPPUWndy); - } public void UpdateValues() @@ -47,6 +53,7 @@ namespace BizHawk.MultiClient private void NESPPU_Load(object sender, EventArgs e) { LoadConfigSettings(); + Nes = Global.Emulator as NES; } } }