pad_connection_pad_init: improve detection

This commit is contained in:
twinaphex 2015-04-04 16:42:38 +02:00
parent a6056819cf
commit 52312b51a7

View File

@ -88,15 +88,16 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
{ {
for (i = 0; name && pad_map[i].name; i++) for (i = 0; name && pad_map[i].name; i++)
{ {
if ( (!strstr(name, pad_map[i].name)) char *name_match = strstr(name, pad_map[i].name);
|| (pad_map[i].vid == vid && pad_map[i].pid == pid))
continue;
s->iface = pad_map[i].iface; if (name_match || (pad_map[i].vid == vid && pad_map[i].pid == pid))
s->data = s->iface->init(data, pad, ptr); {
s->connected = true; s->iface = pad_map[i].iface;
s->data = s->iface->init(data, pad, ptr);
return pad; s->connected = true;
return pad;
}
} }
} }
} }