CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-04 10:36:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4254 from danzel/fix-joypad-connection

Browse Source 
Fix joypad_connection handling of unknown controllers
This commit is contained in:
Twinaphex 2016-12-16 12:15:40 +01:00 committed by GitHub
commit 5c522c643c
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/connect/joypad_connection.c
View File

@ -116,6 +116,14 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
break;
}
}
//We failed to find a matching pad, set up one without an iface
if (!s->connected)
{
s->iface = NULL;
s->data = data;
s->connected = true;
}
}
return pad;

3
input/drivers_hid/iohidmanager_hid.c
View File

@ -237,6 +237,7 @@ static void iohidmanager_hid_device_input_callback(void *data, IOReturn result,
static void iohidmanager_hid_device_remove(void *data,
IOReturn result, void* sender)
{
settings_t *settings = config_get_ptr();
struct iohidmanager_hid_adapter *adapter =
(struct iohidmanager_hid_adapter*)data;
iohidmanager_hid_t *hid = (iohidmanager_hid_t*)
@ -246,6 +247,8 @@ static void iohidmanager_hid_device_remove(void *data,
{
input_autoconfigure_disconnect(adapter->slot, adapter->name);
settings->input.device_names[adapter->slot][0] = '\0';
hid->buttons[adapter->slot] = 0;
memset(hid->axes[adapter->slot], 0, sizeof(hid->axes));