diff --git a/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs b/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs index 224720c874..7270ca7027 100644 --- a/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs +++ b/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs @@ -100,6 +100,7 @@ namespace BizHawk.MultiClient public void UpdateValues() { + if (!this.IsHandleCreated || this.IsDisposed) return; if (!(Global.Emulator is NES)) return; NES.PPU ppu = (Global.Emulator as NES).ppu; ppu.NTViewCallback = Callback; diff --git a/BizHawk.MultiClient/NEStools/NESPPU.cs b/BizHawk.MultiClient/NEStools/NESPPU.cs index cd7c8a21d4..9245243529 100644 --- a/BizHawk.MultiClient/NEStools/NESPPU.cs +++ b/BizHawk.MultiClient/NEStools/NESPPU.cs @@ -147,6 +147,7 @@ namespace BizHawk.MultiClient public unsafe void UpdateValues() { + if (!this.IsHandleCreated || this.IsDisposed) return; if (!(Global.Emulator is NES)) return; NES.PPU ppu = (Global.Emulator as NES).ppu; ppu.PPUViewCallback = Callback; diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs index d78a3c867b..4913792541 100644 --- a/BizHawk.MultiClient/tools/TAStudio.cs +++ b/BizHawk.MultiClient/tools/TAStudio.cs @@ -46,8 +46,8 @@ namespace BizHawk.MultiClient public void UpdateValues() { - TASView.BlazingFast = true; if (!this.IsHandleCreated || this.IsDisposed) return; + TASView.BlazingFast = true; if (Global.MainForm.UserMovie.Mode == MOVIEMODE.INACTIVE) TASView.ItemCount = 0; else