From 63ef4125dccdbaaebbd85e6ee91d36f9af8740e4 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 15 May 2020 10:43:30 -0500
Subject: [PATCH] lua - fix client library being null on null emulator

---
 .../tools/Lua/Libraries/ClientLuaLibrary.cs                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs
index c4c351da9b..265d56a63e 100644
--- a/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs
+++ b/src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/ClientLuaLibrary.cs
@@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk
 		[RequiredService]
 		private IEmulator Emulator { get; set; }
 
-		[RequiredService]
+		[OptionalService]
 		private IVideoProvider VideoProvider { get; set; }
 
 		public MainForm MainForm { get; set; }
@@ -68,14 +68,14 @@ namespace BizHawk.Client.EmuHawk
 		[LuaMethod("bufferheight", "Gets the visible height of the emu display surface (the core video output). This excludes the gameExtraPadding you've set.")]
 		public int BufferHeight()
 		{
-			return VideoProvider.BufferHeight;
+			return VideoProvider?.BufferHeight ?? NullVideo.Instance.BufferHeight; // TODO: consider exposing the video provider from mainform, so it can decide NullVideo is the correct substitute
 		}
 
 		[LuaMethodExample("local inclibuf = client.bufferwidth( );")]
 		[LuaMethod("bufferwidth", "Gets the visible width of the emu display surface (the core video output). This excludes the gameExtraPadding you've set.")]
 		public int BufferWidth()
 		{
-			return VideoProvider.BufferWidth;
+			return VideoProvider?.BufferWidth ?? NullVideo.Instance.BufferWidth;
 		}
 
 		[LuaMethodExample("client.clearautohold( );")]