From 6174398fb4f78926fae3818cc160d0b5aa00ecfa Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sat, 3 Dec 2022 01:06:06 +1000
Subject: [PATCH] Also reset padding when removing last Lua script (resolves
 #1509)

---
 .../tools/Lua/LuaConsole.cs                   | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index 0940a1850e..4226ce0d50 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -126,19 +126,7 @@ namespace BizHawk.Client.EmuHawk
 					Settings.Columns = LuaListView.AllColumns;
 					
 					DisplayManager.ClearApiHawkSurfaces();
-
-					if (DisplayManager.ClientExtraPadding != (0, 0, 0, 0))
-					{
-						DisplayManager.ClientExtraPadding = (0, 0, 0, 0);
-						MainForm.FrameBufferResized();
-					}
-
-					if (DisplayManager.GameExtraPadding != (0, 0, 0, 0))
-					{
-						DisplayManager.GameExtraPadding = (0, 0, 0, 0);
-						MainForm.FrameBufferResized();
-					}
-
+					ResetDrawSurfacePadding();
 					(LuaImp as Win32LuaLibraries)?.Close();
 					DisplayManager.OSD.ClearGuiText();
 				}
@@ -585,6 +573,22 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private void ResetDrawSurfacePadding()
+		{
+			var resized = false;
+			if (DisplayManager.ClientExtraPadding != (0, 0, 0, 0))
+			{
+				DisplayManager.ClientExtraPadding = (0, 0, 0, 0);
+				resized = true;
+			}
+			if (DisplayManager.GameExtraPadding != (0, 0, 0, 0))
+			{
+				DisplayManager.GameExtraPadding = (0, 0, 0, 0);
+				resized = true;
+			}
+			if (resized) MainForm.FrameBufferResized();
+		}
+
 		/// <summary>
 		/// resumes suspended Co-routines
 		/// </summary>
@@ -950,6 +954,7 @@ namespace BizHawk.Client.EmuHawk
 				UpdateDialog();
 				DisplayManager.ClearApiHawkSurfaces();
 				DisplayManager.OSD.ClearGuiText();
+				if (!LuaImp.ScriptList.Any(static lf => !lf.IsSeparator)) ResetDrawSurfacePadding(); // just removed last script, reset padding
 			}
 		}