From c4b2ecfd8464d387ce102350d5da037f6ab6dff7 Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Wed, 30 Mar 2011 00:15:39 +0000
Subject: [PATCH] NES Nametable Viewer - some other misc set ups

---
 BizHawk.MultiClient/MainForm.MenuItems.cs       |  1 +
 BizHawk.MultiClient/MainForm.cs                 |  2 ++
 .../NEStools/NESNameTableViewer.cs              | 17 +++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index c372bd7254..77368d6724 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -254,6 +254,7 @@ namespace BizHawk.MultiClient
             RamSearch1.Restart();
             HexEditor1.Restart();
             NESPPU1.Restart();
+            NESNameTableViewer1.Restart();
             NESDebug1.Restart();
             Cheats1.Restart();
 			Text = "BizHawk";
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 066fec1eec..2173100de4 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -563,6 +563,7 @@ namespace BizHawk.MultiClient
 				RamSearch1.Restart();
 				HexEditor1.Restart();
                 NESPPU1.Restart();
+                NESNameTableViewer1.Restart();
                 NESDebug1.Restart();
                 if (Global.Config.LoadCheatFileByGame)
                 {
@@ -777,6 +778,7 @@ namespace BizHawk.MultiClient
 				RamWatch1.UpdateValues();
 				RamSearch1.UpdateValues();
                 HexEditor1.UpdateValues();
+                NESNameTableViewer1.UpdateValues();
                 NESPPU1.UpdateValues();
                 if (InputLog.GetMovieMode() ==  MOVIEMODE.RECORD)
                     InputLog.GetMnemonic();
diff --git a/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs b/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs
index acdf62b64f..65cbbc8f64 100644
--- a/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs
+++ b/BizHawk.MultiClient/NEStools/NESNameTableViewer.cs
@@ -13,6 +13,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 NESNameTableViewer()
         {
@@ -26,6 +27,20 @@ namespace BizHawk.MultiClient
             Global.Config.NESNameTableWndy = this.Location.Y;
         }
 
+        public void UpdateValues()
+        {
+            if (!(Global.Emulator is NES)) return;
+            if (!this.IsHandleCreated || this.IsDisposed) return;
+
+
+        }
+
+        public void Restart()
+        {
+            if (!(Global.Emulator is NES)) this.Close();
+            Nes = Global.Emulator as NES;
+        }
+
         private void NESNameTableViewer_Load(object sender, EventArgs e)
         {
             defaultWidth = this.Size.Width;     //Save these first so that the user can restore to its original size
@@ -33,6 +48,8 @@ namespace BizHawk.MultiClient
 
             if (Global.Config.NESNameTableSaveWindowPosition && Global.Config.NESNameTableWndx >= 0 && Global.Config.NESNameTableWndy >= 0)
                 this.Location = new Point(Global.Config.NESNameTableWndx, Global.Config.NESNameTableWndy);
+
+            Nes = Global.Emulator as NES;
         }
 
         private void exitToolStripMenuItem_Click(object sender, EventArgs e)