godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Fix Input.is_joy_known response for SDL joypads

Browse Source
This commit is contained in:
JestemStefan
2025-10-11 17:50:39 +02:00
parent 9a5d6d1049
commit 3f98a5472d
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/input/input.cpp
View File

@@ -656,10 +656,16 @@ void Input::joy_connection_changed(int p_idx, bool p_connected, const String &p_
int mapping = fallback_mapping;
// Bypass the mapping system if the joypad's mapping is already handled by its driver
// (for example, the SDL joypad driver).
if (!p_joypad_info.get("mapping_handled", false)) {
if (p_joypad_info.get("mapping_handled", false)) {
js.is_known = true;
} else {
for (int i = 0; i < map_db.size(); i++) {
if (js.uid == map_db[i].uid) {
mapping = i;
if (mapping != fallback_mapping) {
js.is_known = true;
}
break;
}
}
}
@@ -1859,13 +1865,7 @@ void Input::set_fallback_mapping(const String &p_guid) {
//platforms that use the remapping system can override and call to these ones
bool Input::is_joy_known(int p_device) {
if (joy_names.has(p_device)) {
int mapping = joy_names[p_device].mapping;
if (mapping != -1 && mapping != fallback_mapping) {
return true;
}
}
return false;
return joy_names.has(p_device) && joy_names[p_device].is_known;
}
String Input::get_joy_guid(int p_device) const {