From f81f745fcc710b148858b76cff903d66ddb828d5 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 23 May 2017 18:06:27 -0500
Subject: [PATCH] Some luaconsole refactoring and moving more logic into LuaImp

---
 .../Lua/Libraries/EmuLuaLibrary.Client.cs     |  5 +-
 .../tools/Lua/Libraries/EmuLuaLibrary.cs      |  8 +++
 .../tools/Lua/LuaConsole.cs                   | 55 ++++++++++---------
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
index bea72f62b2..54f514cbf4 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
@@ -217,10 +217,9 @@ namespace BizHawk.Client.EmuHawk
 		[LuaMethodAttributes("reboot_core", "Reboots the currently loaded core")]
 		public static void RebootCore()
 		{
-			// pretty hacky.. we dont want a lua script to be able to restart itself by rebooting the core
-			((LuaConsole)GlobalWin.Tools.Get<LuaConsole>()).IsRebootingCore = true;
+			((LuaConsole)GlobalWin.Tools.Get<LuaConsole>()).LuaImp.IsRebootingCore = true;
 			GlobalWin.MainForm.RebootCore();
-			((LuaConsole)GlobalWin.Tools.Get<LuaConsole>()).IsRebootingCore = false;
+			((LuaConsole)GlobalWin.Tools.Get<LuaConsole>()).LuaImp.IsRebootingCore = false;
 		}
 
 		[LuaMethodAttributes("screenheight", "Gets the current height in pixels of the emulator's drawing area")]
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
index 65df2b36e5..b9d1ea133f 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
@@ -81,8 +81,16 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		public bool IsRebootingCore { get; set; } // pretty hacky.. we dont want a lua script to be able to restart itself by rebooting the core
+
 		private readonly Dictionary<Type, LuaLibraryBase> Libraries = new Dictionary<Type, LuaLibraryBase>();
 		public LuaFileList ScriptList { get; } = new LuaFileList();
+
+		public IEnumerable<LuaFile> RunningScripts
+		{
+			get { return ScriptList.Where(lf => lf.Enabled); }
+		}
+
 		private Lua _lua = new Lua();
 		private Lua _currThread;
 
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index b4f34de795..1b0994ffd4 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -25,8 +25,6 @@ namespace BizHawk.Client.EmuHawk
 		private readonly List<string> _consoleCommandHistory = new List<string>();
 		private int _consoleCommandHistoryIndex = -1;
 
-		public bool IsRebootingCore { get; set; }
-
 		public ToolDialogSettings.ColumnList Columns { get; set; }
 
 		public class LuaConsoleSettings
@@ -136,34 +134,41 @@ namespace BizHawk.Client.EmuHawk
 
 		public void Restart()
 		{
-			// Even if the lua console is self-rebooting from client.reboot_core() we still want to re-inject dependencies
-			if (IsRebootingCore)
+			List<LuaFile> runningScripts = new List<LuaFile>();
+
+			if (LuaImp != null) // Things we need to do with the existing LuaImp before we can make a new one
 			{
-				LuaImp.Restart(Emulator.ServiceProvider);
-				return;
-			}
-
-			if (LuaImp?.GuiLibrary != null && LuaImp.GuiLibrary.HasLuaSurface)
-			{
-				LuaImp.GuiLibrary.DrawFinish();
-			}
-
-			var runningScripts = LuaImp?.ScriptList.Where(f => f.Enabled).ToList() ?? new List<LuaFile>();
-
-			foreach (var file in runningScripts)
-			{
-				LuaImp.CallExitEvent(file.Thread);
-
-				var functions = LuaImp.RegisteredFunctions.Where(lf => lf.Lua == file.Thread).ToList();
-
-				foreach (var function in functions)
+				if (LuaImp.IsRebootingCore == true)
 				{
-					LuaImp.RegisteredFunctions.Remove(function);
+					// Even if the lua console is self-rebooting from client.reboot_core() we still want to re-inject dependencies
+					LuaImp.Restart(Emulator.ServiceProvider);
+					return;
 				}
 
-				UpdateRegisteredFunctionsDialog();
+				if (LuaImp.GuiLibrary != null && LuaImp.GuiLibrary.HasLuaSurface)
+				{
+					LuaImp.GuiLibrary.DrawFinish();
+				}
 
-				file.Stop();
+				runningScripts = LuaImp.RunningScripts.ToList();
+
+				foreach (var file in runningScripts)
+				{
+					LuaImp.CallExitEvent(file.Thread);
+
+					var functions = LuaImp.RegisteredFunctions
+						.Where(lf => lf.Lua == file.Thread)
+						.ToList();
+
+					foreach (var function in functions)
+					{
+						LuaImp.RegisteredFunctions.Remove(function);
+					}
+
+					UpdateRegisteredFunctionsDialog();
+
+					file.Stop();
+				}
 			}
 
 			var currentScripts = LuaImp?.ScriptList; // Temp fix for now