aboutsummaryrefslogtreecommitdiff
path: root/main/input_default.cpp
diff options
context:
space:
mode:
authorhinsbart2016-02-29 16:48:19 +0100
committerhinsbart2016-02-29 16:48:19 +0100
commit0022af96476e55a2d4d26f7f54e22eb4a3f42ded (patch)
tree715b2b156f3ff0548044ed2552579d00f6ee0d98 /main/input_default.cpp
parent210d332defffb5528da6c6aff3b28fb8732bf007 (diff)
downloadgodot-0022af96476e55a2d4d26f7f54e22eb4a3f42ded.tar.gz
godot-0022af96476e55a2d4d26f7f54e22eb4a3f42ded.tar.zst
godot-0022af96476e55a2d4d26f7f54e22eb4a3f42ded.zip
Diffstat (limited to 'main/input_default.cpp')
-rw-r--r--main/input_default.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp
index 734fdf5af..226656d8f 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -173,6 +173,7 @@ void InputDefault::joy_connection_changed(int p_idx, bool p_connected, String p_
for (int i=0; i < map_db.size(); i++) {
if (js.uid == map_db[i].uid) {
mapping = i;
+ js.name = map_db[i].name;
//printf("found mapping\n");
};
};
@@ -826,6 +827,7 @@ void InputDefault::parse_mapping(String p_mapping) {
uid.resize(17);
mapping.uid = entry[0];
+ mapping.name = entry[1];
int idx = 1;
while (++idx < entry.size()) {