From a2185d9ef0456f6881345466229fd0950e35051b Mon Sep 17 00:00:00 2001 From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com> Date: Fri, 28 Apr 2023 03:12:44 -0700 Subject: [PATCH] fix 70bd081a930d232fcfd6732549eb7488bb67f5fc The entire call is skipped in release mode if you place it inside a Debug.Assert. --- src/BizHawk.Client.EmuHawk/Api/ApiManager.cs | 4 +++- src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/Api/ApiManager.cs b/src/BizHawk.Client.EmuHawk/Api/ApiManager.cs index f96dd9348c..82cb35ca89 100644 --- a/src/BizHawk.Client.EmuHawk/Api/ApiManager.cs +++ b/src/BizHawk.Client.EmuHawk/Api/ApiManager.cs @@ -63,7 +63,9 @@ namespace BizHawk.Client.EmuHawk tuple => { var instance = tuple.Ctor.Invoke(tuple.CtorTypes.Select(t => avail[t]).ToArray()); - Debug.Assert(ServiceInjector.UpdateServices(serviceProvider, instance, mayCache: true)); + var success = ServiceInjector.UpdateServices(serviceProvider, instance, mayCache: true); + Debug.Assert(success); + _ = success; return (IExternalApi) instance; })); } diff --git a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs index 300521d3f4..2bccccdc80 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Lua/LuaLibraries.cs @@ -66,7 +66,9 @@ namespace BizHawk.Client.EmuHawk || lib.GetCustomAttribute(inherit: false)?.Released is not false) { var instance = (LuaLibraryBase)Activator.CreateInstance(lib, this, _apiContainer, (Action)LogToLuaConsole); - Debug.Assert(ServiceInjector.UpdateServices(serviceProvider, instance, mayCache: true)); + var updateSuccess = ServiceInjector.UpdateServices(serviceProvider, instance, mayCache: true); + Debug.Assert(updateSuccess); + _ = updateSuccess; // TODO: make EmuHawk libraries have a base class with common properties such as this // and inject them here