change these to using var

Author: CasualPokePlayer

src/BizHawk.Client.EmuHawk/tools/Lua/Win32LuaLibraries.cs

@@ -185,91 +185,86 @@ public void Restart(
 
 		public void CallSaveStateEvent(string name)
 		{
-			using (GuiAPI.ThisIsTheLuaAutoUnlockHack())
+			using var luaAutoUnlockHack = GuiAPI.ThisIsTheLuaAutoUnlockHack();
+
+			try
 			{
-				try
-				{
-					foreach (var lf in RegisteredFunctions.Where(static l => l.Event == NamedLuaFunction.EVENT_TYPE_SAVESTATE).ToList())
-					{
-						lf.Call(name);
-					}
-				}
-				catch (Exception e)
+				foreach (var lf in RegisteredFunctions.Where(static l => l.Event == NamedLuaFunction.EVENT_TYPE_SAVESTATE).ToList())
 				{
-					LogToLuaConsole($"error running function attached by lua function event.onsavestate\nError message: {e.Message}");
+					lf.Call(name);
 				}
 			}
+			catch (Exception e)
+			{
+				LogToLuaConsole($"error running function attached by lua function event.onsavestate\nError message: {e.Message}");
+			}
 		}
 
 		public void CallLoadStateEvent(string name)
 		{
-			using (GuiAPI.ThisIsTheLuaAutoUnlockHack())
+			using var luaAutoUnlockHack = GuiAPI.ThisIsTheLuaAutoUnlockHack();
+
+			try
 			{
-				try
+				foreach (var lf in RegisteredFunctions.Where(static l => l.Event == NamedLuaFunction.EVENT_TYPE_LOADSTATE).ToList())
 				{
-					foreach (var lf in RegisteredFunctions.Where(static l => l.Event == NamedLuaFunction.EVENT_TYPE_LOADSTATE).ToList())
-					{
-						lf.Call(name);
-					}
-				}
-				catch (Exception e)
-				{
-					LogToLuaConsole($"error running function attached by lua function event.onloadstate\nError message: {e.Message}");
+					lf.Call(name);
 				}
 			}
+			catch (Exception e)
+			{
+				LogToLuaConsole($"error running function attached by lua function event.onloadstate\nError message: {e.Message}");
+			}
 		}
 
 		public void CallFrameBeforeEvent()
 		{
 			if (IsUpdateSupressed) return;
 
-			using (GuiAPI.ThisIsTheLuaAutoUnlockHack())
+			using var luaAutoUnlockHack = GuiAPI.ThisIsTheLuaAutoUnlockHack();
+
+			try
 			{
-				try
-				{
-					foreach (var lf in RegisteredFunctions.Where(static l => l.Event == NamedLuaFunction.EVENT_TYPE_PREFRAME).ToList())
-					{
-						lf.Call();
-					}
-				}
-				catch (Exception e)
+				foreach (var lf in RegisteredFunctions.Where(static l => l.Event == NamedLuaFunction.EVENT_TYPE_PREFRAME).ToList())
 				{
-					LogToLuaConsole($"error running function attached by lua function event.onframestart\nError message: {e.Message}");
+					lf.Call();
 				}
 			}
+			catch (Exception e)
+			{
+				LogToLuaConsole($"error running function attached by lua function event.onframestart\nError message: {e.Message}");
+			}
 		}
 
 		public void CallFrameAfterEvent()
 		{
 			if (IsUpdateSupressed) return;
 
-			using (GuiAPI.ThisIsTheLuaAutoUnlockHack())
+			using var luaAutoUnlockHack = GuiAPI.ThisIsTheLuaAutoUnlockHack();
+
+			try
 			{
-				try
-				{
-					foreach (var lf in RegisteredFunctions.Where(static l => l.Event == NamedLuaFunction.EVENT_TYPE_POSTFRAME).ToList())
-					{
-						lf.Call();
-					}
-				}
-				catch (Exception e)
+				foreach (var lf in RegisteredFunctions.Where(static l => l.Event == NamedLuaFunction.EVENT_TYPE_POSTFRAME).ToList())
 				{
-					LogToLuaConsole($"error running function attached by lua function event.onframeend\nError message: {e.Message}");
+					lf.Call();
 				}
 			}
+			catch (Exception e)
+			{
+				LogToLuaConsole($"error running function attached by lua function event.onframeend\nError message: {e.Message}");
+			}
 		}
 
 		public void CallExitEvent(LuaFile lf)
 		{
-			using (GuiAPI.ThisIsTheLuaAutoUnlockHack())
+			using var luaAutoUnlockHack = GuiAPI.ThisIsTheLuaAutoUnlockHack();
+
+			foreach (var exitCallback in RegisteredFunctions
+				.Where(l => l.Event == NamedLuaFunction.EVENT_TYPE_ENGINESTOP
+					&& (l.LuaFile.Path == lf.Path || ReferenceEquals(l.LuaFile.Thread, lf.Thread)))
+				.ToList())
 			{
-				foreach (var exitCallback in RegisteredFunctions
-					.Where(l => l.Event == NamedLuaFunction.EVENT_TYPE_ENGINESTOP
-						&& (l.LuaFile.Path == lf.Path || ReferenceEquals(l.LuaFile.Thread, lf.Thread)))
-					.ToList())
-				{
-					exitCallback.Call();
-				}
+				exitCallback.Call();
 			}
 		}
 
@@ -327,31 +322,29 @@ public void ExecuteString(string command)
 
 		public (bool WaitForFrame, bool Terminated) ResumeScript(LuaFile lf)
 		{
-			using (GuiAPI.ThisIsTheLuaAutoUnlockHack())
-			{
-				_currThread = lf.Thread;
-
-				try
-				{
-					LuaLibraryBase.SetCurrentThread(lf);
+			_currThread = lf.Thread;
+			using var luaAutoUnlockHack = GuiAPI.ThisIsTheLuaAutoUnlockHack();
 
-					var execResult = _currThread.Resume();
+			try
+			{
+				LuaLibraryBase.SetCurrentThread(lf);
 
-					_currThread = null;
-					var result = execResult switch
-					{
-						KeraLua.LuaStatus.OK => (WaitForFrame: false, Terminated: true),
-						KeraLua.LuaStatus.Yield => (WaitForFrame: FrameAdvanceRequested, Terminated: false),
-						_ => throw new InvalidOperationException($"{nameof(_currThread.Resume)}() returned {execResult}?")
-					};
+				var execResult = _currThread.Resume();
 
-					FrameAdvanceRequested = false;
-					return result;
-				}
-				finally
+				_currThread = null;
+				var result = execResult switch
 				{
-					LuaLibraryBase.ClearCurrentThread();
-				}
+					KeraLua.LuaStatus.OK => (WaitForFrame: false, Terminated: true),
+					KeraLua.LuaStatus.Yield => (WaitForFrame: FrameAdvanceRequested, Terminated: false),
+					_ => throw new InvalidOperationException($"{nameof(_currThread.Resume)}() returned {execResult}?")
+				};
+
+				FrameAdvanceRequested = false;
+				return result;
+			}
+			finally
+			{
+				LuaLibraryBase.ClearCurrentThread();
 			}
 		}