Fix clear_callback in set_hotkey

spelunky-fyi · Mar 5, 2024 · 4f446a8 · 4f446a8
1 parent ebba64b
commit 4f446a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/game_api/script/lua_backend.cpp b/src/game_api/script/lua_backend.cpp
@@ -1996,7 +1996,7 @@ int LuaBackend::register_hotkey(HotKeyCallback cb, HOTKEY_TYPE flags)
 
 void LuaBackend::hotkey_callback(int cb)
 {
-    if (!hotkey_callbacks.contains(cb))
+    if (!get_enabled() || !hotkey_callbacks.contains(cb))
         return;
     hotkey_callbacks[cb].queue++;
 }

diff --git a/src/game_api/script/lua_vm.cpp b/src/game_api/script/lua_vm.cpp
@@ -528,6 +528,7 @@ end
             switch (caller.type)
             {
             case CallbackType::Normal:
+            case CallbackType::HotKey:
                 backend->clear_callbacks.push_back(caller.id);
                 break;
             case CallbackType::Entity: