From 1e41dbf20d4be4eb30e31e435fd12841763fb6bc Mon Sep 17 00:00:00 2001 From: adelikat Date: Sat, 21 Dec 2019 17:16:16 -0600 Subject: [PATCH] LuaRegisteredFunctionsList - override Clear() so that needed clear logic can't be mistakenly not called. Fixes #1763 --- BizHawk.Client.Common/lua/LuaFunctionList.cs | 4 ++-- .../tools/Lua/LuaRegisteredFunctionsList.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BizHawk.Client.Common/lua/LuaFunctionList.cs b/BizHawk.Client.Common/lua/LuaFunctionList.cs index 7d93144f9d..4983c3b783 100644 --- a/BizHawk.Client.Common/lua/LuaFunctionList.cs +++ b/BizHawk.Client.Common/lua/LuaFunctionList.cs @@ -37,7 +37,7 @@ namespace BizHawk.Client.Common } } - public void ClearAll() + public new void Clear() { if (Global.Emulator.InputCallbacksAvailable()) { @@ -50,7 +50,7 @@ namespace BizHawk.Client.Common memoryCallbacks.RemoveAll(this.Select(w => w.MemCallback)); } - Clear(); + base.Clear(); } } diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs index fee2f09f21..254c661e85 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaRegisteredFunctionsList.cs @@ -102,7 +102,7 @@ namespace BizHawk.Client.EmuHawk private void RemoveAllBtn_Click(object sender, EventArgs e) { - GlobalWin.Tools.LuaConsole.LuaImp.RegisteredFunctions.ClearAll(); + GlobalWin.Tools.LuaConsole.LuaImp.RegisteredFunctions.Clear(); PopulateListView(); }