From c6e03b98d353aaf72eaf2460600ab7c938c0d079 Mon Sep 17 00:00:00 2001 From: asimon-1 <40246417+asimon-1@users.noreply.github.com> Date: Tue, 23 Apr 2024 20:43:46 -0700 Subject: [PATCH] Prevent button combos from passing if either the (#684) vanilla or mod menu is open --- src/common/button_config.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/common/button_config.rs b/src/common/button_config.rs index c92a960..81de989 100644 --- a/src/common/button_config.rs +++ b/src/common/button_config.rs @@ -197,6 +197,11 @@ lazy_static! { fn _combo_passes(p1_controller: Controller, combo: ButtonCombo) -> bool { unsafe { + // Prevent button combos from passing if either the vanilla or mod menu is open + if VANILLA_MENU_ACTIVE || QUICK_MENU_ACTIVE { + return false; + } + let combo_keys = get_combo_keys(combo).to_vec(); let mut this_combo_passes = false;