Merge pull request #66750 from EricEzaM/62899-allow-shortcut-joypab-btn

Allow shortcut input to be JoypadButton.
godotengine · Oct 3, 2022 · d331b80 · d331b80
2 parents 4e237ed + 2a7e614
commit d331b80
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
@@ -2799,7 +2799,7 @@ void Viewport::push_unhandled_input(const Ref<InputEvent> &p_event, bool p_local
 	}
 
 	// Shortcut Input.
-	if (Object::cast_to<InputEventKey>(*ev) != nullptr || Object::cast_to<InputEventShortcut>(*ev) != nullptr) {
+	if (Object::cast_to<InputEventKey>(*ev) != nullptr || Object::cast_to<InputEventShortcut>(*ev) != nullptr || Object::cast_to<InputEventJoypadButton>(*ev) != nullptr) {
 		get_tree()->_call_input_pause(shortcut_input_group, SceneTree::CALL_INPUT_TYPE_SHORTCUT_INPUT, ev, this);
 	}