From a1ccac4d67a4baf6d7aaf415522e30963573ef95 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Mon, 30 Nov 2020 19:57:13 +1000
Subject: [PATCH] Delegate ClientLuaLibrary.FrameSkip to ApiHawk

the ApiHawk copy was the bad one
---
 .../Api/Libraries/EmuClientApi.cs                  | 11 +++++------
 .../tools/Lua/Libraries/ClientLuaLibrary.cs        | 14 +-------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs b/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs
index 8bd42eb68d..11706b58f3 100644
--- a/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs
+++ b/src/BizHawk.Client.EmuHawk/Api/Libraries/EmuClientApi.cs
@@ -130,15 +130,14 @@ namespace BizHawk.Client.EmuHawk
 
 		public void FrameSkip(int numFrames)
 		{
-			if (numFrames > 0)
-			{
-				_config.FrameSkip = numFrames;
-				_mainForm.FrameSkipMessage();
-			}
-			else
+			if (numFrames < 0)
 			{
 				_logCallback("Invalid frame skip value");
+				return;
 			}
+
+			_config.FrameSkip = numFrames;
+			_mainForm.FrameSkipMessage();
 		}
 
 		private void GetAllInputs()
diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs
index b6ddbf78e6..fb89e3bd3f 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs
@@ -76,19 +76,7 @@ namespace BizHawk.Client.EmuHawk
 
 		[LuaMethodExample("client.frameskip( 8 );")]
 		[LuaMethod("frameskip", "Sets the frame skip value of the client UI (use 0 to disable)")]
-		public void FrameSkip(int numFrames)
-		{
-			//TODO delegate to APIs.EmuClient (impl uses `> 0` instead of `>= 0`)
-			if (numFrames >= 0)
-			{
-				GlobalWin.Config.FrameSkip = numFrames;
-				MainForm.FrameSkipMessage();
-			}
-			else
-			{
-				Log("Invalid frame skip value");
-			}
-		}
+		public void FrameSkip(int numFrames) => APIs.EmuClient.FrameSkip(numFrames);
 
 		[LuaMethodExample("client.invisibleemulation( true );")]
 		[LuaMethod("invisibleemulation", "Disables and enables emulator updates")]