CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-24 03:36:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent potential crash

Browse Source
This commit is contained in:
twinaphex 2017-12-31 07:15:18 +01:00
parent 768be8b9c8
commit 5aa159431e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
input/connect/joypad_connection.c
View File

@ -207,7 +207,7 @@ void pad_connection_packet(joypad_connection_t *joyconn, uint32_t pad,
void pad_connection_get_buttons(joypad_connection_t *joyconn, unsigned pad, retro_bits_t* state) void pad_connection_get_buttons(joypad_connection_t *joyconn, unsigned pad, retro_bits_t* state)
{ {
if (joyconn->iface) if (joyconn && joyconn->iface)
joyconn->iface->get_buttons(joyconn->data, state); joyconn->iface->get_buttons(joyconn->data, state);
else else
BIT256_CLEAR_ALL_PTR( state ); BIT256_CLEAR_ALL_PTR( state );
@ -216,7 +216,7 @@ void pad_connection_get_buttons(joypad_connection_t *joyconn, unsigned pad, retr
int16_t pad_connection_get_axis(joypad_connection_t *joyconn, int16_t pad_connection_get_axis(joypad_connection_t *joyconn,
unsigned idx, unsigned i) unsigned idx, unsigned i)
{ {
if (!joyconn->iface) if (!joyconn || !joyconn->iface)
return 0; return 0;
return joyconn->iface->get_axis(joyconn->data, i); return joyconn->iface->get_axis(joyconn->data, i);
} }
@ -254,7 +254,7 @@ bool pad_connection_rumble(joypad_connection_t *joyconn,
const char* pad_connection_get_name(joypad_connection_t *joyconn, unsigned pad) const char* pad_connection_get_name(joypad_connection_t *joyconn, unsigned pad)
{ {
if (!joyconn->iface || !joyconn->iface->get_name) if (!joyconn || !joyconn->iface || !joyconn->iface->get_name)
return NULL; return NULL;
return joyconn->iface->get_name(joyconn->data); return joyconn->iface->get_name(joyconn->data);
} }