summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-02-13 18:00:33 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-02-13 18:00:33 +0100
commit1c1b5da2629f65bb14113919b3ca48ad4d08b516 (patch)
tree85bce30d27e531e3b6a79615013222b50138e200
parentd405392847149e1620324ac9217952bc51884baf (diff)
parente841f13cdcab6531c1e65df39906d7b24a9fc7e8 (diff)
Merge pull request #73224 from rsubtil/bugfix-input_joypad_warn
Change message of unknown joypad property from error to verbose
-rw-r--r--core/input/input.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/input/input.cpp b/core/input/input.cpp
index c04fc894c8..b2164b8e76 100644
--- a/core/input/input.cpp
+++ b/core/input/input.cpp
@@ -1365,8 +1365,9 @@ void Input::parse_mapping(String p_mapping) {
JoyButton output_button = _get_output_button(output);
JoyAxis output_axis = _get_output_axis(output);
- ERR_CONTINUE_MSG(output_button == JoyButton::INVALID && output_axis == JoyAxis::INVALID,
- vformat("Unrecognized output string \"%s\" in mapping:\n%s", output, p_mapping));
+ if (output_button == JoyButton::INVALID && output_axis == JoyAxis::INVALID) {
+ print_verbose(vformat("Unrecognized output string \"%s\" in mapping:\n%s", output, p_mapping));
+ }
ERR_CONTINUE_MSG(output_button != JoyButton::INVALID && output_axis != JoyAxis::INVALID,
vformat("Output string \"%s\" matched both button and axis in mapping:\n%s", output, p_mapping));