From 52312b51a7629494de1008f24e624b56215c2206 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 4 Apr 2015 16:42:38 +0200 Subject: [PATCH] pad_connection_pad_init: improve detection --- input/connect/joypad_connection.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/input/connect/joypad_connection.c b/input/connect/joypad_connection.c index 8af34d7c3e..7da31ea165 100644 --- a/input/connect/joypad_connection.c +++ b/input/connect/joypad_connection.c @@ -88,15 +88,16 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn, { for (i = 0; name && pad_map[i].name; i++) { - if ( (!strstr(name, pad_map[i].name)) - || (pad_map[i].vid == vid && pad_map[i].pid == pid)) - continue; + char *name_match = strstr(name, pad_map[i].name); - s->iface = pad_map[i].iface; - s->data = s->iface->init(data, pad, ptr); - s->connected = true; - - return pad; + if (name_match || (pad_map[i].vid == vid && pad_map[i].pid == pid)) + { + s->iface = pad_map[i].iface; + s->data = s->iface->init(data, pad, ptr); + s->connected = true; + + return pad; + } } } }