From 0ed95429cb7baa91036ee76c16bb8692ea06594c Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 24 Jul 2020 14:36:34 -0500
Subject: [PATCH] simplify some closing closing logic in some tools

---
 src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs   | 7 +------
 src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs  | 7 +------
 src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs | 7 +------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
index aa1d274a10..68acb63a96 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
@@ -58,7 +58,7 @@ namespace BizHawk.Client.EmuHawk
 
 			Closing += (o, e) =>
 			{
-				SaveConfigSettings();
+				Settings.Columns = CheatListView.AllColumns;
 			};
 
 			CheatListView.QueryItemText += CheatListView_QueryItemText;
@@ -200,11 +200,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void SaveConfigSettings()
-		{
-			Settings.Columns = CheatListView.AllColumns;
-		}
-
 		private void LoadConfigSettings()
 		{
 			CheatListView.AllColumns.Clear();
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs
index ad4f8ca4de..33694e4ca3 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaWinform.cs
@@ -21,12 +21,7 @@ namespace BizHawk.Client.EmuHawk
 			InitializeComponent();
 			Icon = Properties.Resources.TextDocIcon;
 			StartPosition = FormStartPosition.CenterParent;
-			Closing += (o, e) => CloseThis();
-		}
-
-		private void CloseThis()
-		{
-			_luaImp.WindowClosed(Handle);
+			Closing += (o, e) => { _luaImp.WindowClosed(Handle); };
 		}
 
 		public void DoLuaEvent(IntPtr handle)
diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
index ab2c90d52a..cf4cb2a4ba 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
@@ -84,7 +84,7 @@ namespace BizHawk.Client.EmuHawk
 
 			WatchListView.QueryItemText += ListView_QueryItemText;
 			WatchListView.QueryItemBkColor += ListView_QueryItemBkColor;
-			Closing += (o, e) => SaveConfigSettings();
+			Closing += (o, e) => { Settings.Columns = WatchListView.AllColumns; };
 
 			_sortedColumn = "";
 			_sortReverse = false;
@@ -316,11 +316,6 @@ namespace BizHawk.Client.EmuHawk
 			HardSetDisplayTypeDropDown(_settings.Type);
 		}
 
-		private void SaveConfigSettings()
-		{
-			Settings.Columns = WatchListView.AllColumns;
-		}
-
 		public void NewSearch()
 		{
 			var compareTo = _searches.CompareTo;