From ecf9e6efc04341adfcde25fb8edd0ba768ccfabf Mon Sep 17 00:00:00 2001
From: taotao54321 <taotao54321@gmail.com>
Date: Fri, 9 Mar 2012 20:10:01 +0000
Subject: [PATCH] Now NESNameTableViewer, NESPPU, NESDebugger, Cheats,
 TI83KeyPad, TAStudio should save the settings correctly.

---
 BizHawk.MultiClient/MainForm.cs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index bd60313663..05d9369b13 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -2243,15 +2243,23 @@ namespace BizHawk.MultiClient
 				Global.Config.MainWndx = -1;
 				Global.Config.MainWndy = -1;
 			}
-			if (RamWatch1.IsHandleCreated)
-				RamWatch1.SaveConfigSettings();
-			if (RamSearch1.IsHandleCreated)
-				RamSearch1.SaveConfigSettings();
-			if (!HexEditor1.IsDisposed)
-				HexEditor1.SaveConfigSettings();
+			CloseForm(RamWatch1);
+			CloseForm(RamSearch1);
+			CloseForm(HexEditor1);
+			CloseForm(NESNameTableViewer1);
+			CloseForm(NESPPU1);
+			CloseForm(NESDebug1);
+			CloseForm(Cheats1);
+			CloseForm(TI83KeyPad1);
+			CloseForm(TAStudio1);
 			ConfigService.Save(PathManager.DefaultIniPath, Global.Config);
 		}
 
+		private void CloseForm(Form form)
+		{
+			if (form.IsHandleCreated) form.Close();
+		}
+
 		private void PreviousSlot()
 		{
 			if (Global.Config.SaveSlot == 0)