From 4be160a71fb60f90a084c5b9c90e061591edd2c0 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 31 May 2020 11:17:35 -0500
Subject: [PATCH] Lua console - unify Save/SaveAs logic and remove a now
 unnecessary LuaFileList method

---
 src/BizHawk.Client.Common/lua/LuaFileList.cs  |  9 ------
 .../tools/Lua/LuaConsole.cs                   | 31 +++++++++----------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/BizHawk.Client.Common/lua/LuaFileList.cs b/src/BizHawk.Client.Common/lua/LuaFileList.cs
index 57659b157d..67a413c55a 100644
--- a/src/BizHawk.Client.Common/lua/LuaFileList.cs
+++ b/src/BizHawk.Client.Common/lua/LuaFileList.cs
@@ -94,15 +94,6 @@ namespace BizHawk.Client.Common
 
 			Filename = path;
 			return true;
-
-		}
-
-		public void SaveSession()
-		{
-			if (!string.IsNullOrWhiteSpace(Filename))
-			{
-				SaveSession(Filename);
-			}
 		}
 
 		public void SaveSession(string path)
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index ae3eab6c91..9270cff640 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -690,14 +690,7 @@ namespace BizHawk.Client.EmuHawk
 				GlobalWin.Sound.StartSound();
 				if (result == DialogResult.Yes)
 				{
-					if (!string.IsNullOrWhiteSpace(LuaImp.ScriptList.Filename))
-					{
-						LuaImp.ScriptList.SaveSession();
-					}
-					else
-					{
-						SaveSessionAs();
-					}
+					SaveOrSaveAs();
 
 					return true;
 				}
@@ -725,6 +718,18 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private void SaveOrSaveAs()
+		{
+			if (!string.IsNullOrWhiteSpace(LuaImp.ScriptList.Filename))
+			{
+				LuaImp.ScriptList.SaveSession(LuaImp.ScriptList.Filename);
+			}
+			else
+			{
+				SaveSessionAs();
+			}
+		}
+
 		private void FileSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
 			SaveSessionMenuItem.Enabled = LuaImp.ScriptList.Changes;
@@ -780,15 +785,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (LuaImp.ScriptList.Changes)
 			{
-				if (!string.IsNullOrWhiteSpace(LuaImp.ScriptList.Filename))
-				{
-					LuaImp.ScriptList.SaveSession();
-				}
-				else
-				{
-					SaveSessionAs();
-				}
-
+				SaveOrSaveAs();
 				OutputMessages.Text = $"{Path.GetFileName(LuaImp.ScriptList.Filename)} saved.";
 			}
 		}