Autolock hack is nothing without autounlock hack

Author: YoshiRulz

src/BizHawk.Client.Common/Api/Classes/GuiApi.cs

@@ -158,7 +158,11 @@ public void WithSurface(DisplaySurfaceID surfaceID, Action drawingCallsFunc)
 			}
 		}
 
-		public void UnlockEmuSurfaceLua() => UnlockSurface(DisplaySurfaceID.EmuCore);
+		public void ThisIsTheLuaAutounlockHack()
+		{
+			UnlockSurface(DisplaySurfaceID.EmuCore);
+			UnlockSurface(DisplaySurfaceID.Client);
+		}
 
 		public void DrawNew(string name, bool clear)
 		{

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

@@ -169,11 +169,11 @@ public void CallSaveStateEvent(string name)
 				{
 					lf.Call(name);
 				}
-				GuiAPI.UnlockEmuSurfaceLua();
+				GuiAPI.ThisIsTheLuaAutounlockHack();
 			}
 			catch (Exception e)
 			{
-				GuiAPI.UnlockEmuSurfaceLua();
+				GuiAPI.ThisIsTheLuaAutounlockHack();
 				LogToLuaConsole($"error running function attached by lua function event.onsavestate\nError message: {e.Message}");
 			}
 		}
@@ -186,11 +186,11 @@ public void CallLoadStateEvent(string name)
 				{
 					lf.Call(name);
 				}
-				GuiAPI.UnlockEmuSurfaceLua();
+				GuiAPI.ThisIsTheLuaAutounlockHack();
 			}
 			catch (Exception e)
 			{
-				GuiAPI.UnlockEmuSurfaceLua();
+				GuiAPI.ThisIsTheLuaAutounlockHack();
 				LogToLuaConsole($"error running function attached by lua function event.onloadstate\nError message: {e.Message}");
 			}
 		}
@@ -204,11 +204,11 @@ public void CallFrameBeforeEvent()
 				{
 					lf.Call();
 				}
-				GuiAPI.UnlockEmuSurfaceLua();
+				GuiAPI.ThisIsTheLuaAutounlockHack();
 			}
 			catch (Exception e)
 			{
-				GuiAPI.UnlockEmuSurfaceLua();
+				GuiAPI.ThisIsTheLuaAutounlockHack();
 				LogToLuaConsole($"error running function attached by lua function event.onframestart\nError message: {e.Message}");
 			}
 		}
@@ -222,11 +222,11 @@ public void CallFrameAfterEvent()
 				{
 					lf.Call();
 				}
-				GuiAPI.UnlockEmuSurfaceLua();
+				GuiAPI.ThisIsTheLuaAutounlockHack();
 			}
 			catch (Exception e)
 			{
-				GuiAPI.UnlockEmuSurfaceLua();
+				GuiAPI.ThisIsTheLuaAutounlockHack();
 				LogToLuaConsole($"error running function attached by lua function event.onframeend\nError message: {e.Message}");
 			}
 		}
@@ -237,7 +237,7 @@ public void CallExitEvent(LuaFile lf)
 			{
 				exitCallback.Call();
 			}
-			GuiAPI.UnlockEmuSurfaceLua();
+			GuiAPI.ThisIsTheLuaAutounlockHack();
 		}
 
 		public void Close()
@@ -302,7 +302,7 @@ public void ExecuteString(string command)
 				LuaLibraryBase.SetCurrentThread(lf);
 
 				var execResult = _currThread.Resume(0);
-				GuiAPI.UnlockEmuSurfaceLua();
+				GuiAPI.ThisIsTheLuaAutounlockHack();
 
 				_lua.RunScheduledDisposes(); // TODO: I don't think this is needed anymore, we run this regularly anyway
 
@@ -319,7 +319,7 @@ public void ExecuteString(string command)
 			}
 			catch (Exception)
 			{
-				GuiAPI.UnlockEmuSurfaceLua();
+				GuiAPI.ThisIsTheLuaAutounlockHack();
 				throw;
 			}
 			finally