From 64b083b4968b644642d26c229d810dd18dae3214 Mon Sep 17 00:00:00 2001 From: Andreas Haas Date: Sat, 15 Oct 2016 17:55:15 +0200 Subject: [PATCH] Allow whitespace in Gamepad mappings. Previously, mappings that contained whitespace (most likely after a comma seperator) would not parse correctly. Consider the following mapping as an example: "_test_guid_, test controller, a:b0, b:b1, leftx:a0 ," (cherry picked from commit fa502b7ccc1859b7d75dac841036eda6bff5210d) --- main/input_default.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/input_default.cpp b/main/input_default.cpp index 435ce6233de..371bf107a54 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -995,8 +995,8 @@ void InputDefault::parse_mapping(String p_mapping) { if (entry[idx] == "") continue; - String from = entry[idx].get_slice(":", 1); - String to = entry[idx].get_slice(":", 0); + String from = entry[idx].get_slice(":", 1).replace(" ", ""); + String to = entry[idx].get_slice(":", 0).replace(" ", ""); JoyEvent to_event = _find_to_event(to); if (to_event.type == -1)