mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

more null checks

Browse Source
This commit is contained in:
Brad Parker 2017-09-30 01:18:33 -04:00
parent e376bd75c0
commit c856a36a58
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/task_autodetect.c
View File

@ -131,6 +131,7 @@ static int input_autoconfigure_joypad_try_from_conf(config_file_t *conf,
/* Check for name match */ /* Check for name match */
if (!string_is_empty(params->name) if (!string_is_empty(params->name)
&& !string_is_empty(ident)
&& string_is_equal(ident, params->name)) && string_is_equal(ident, params->name))
score += 2; score += 2;
@ -165,7 +166,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
snprintf(msg, sizeof(msg), "%s configured.", snprintf(msg, sizeof(msg), "%s configured.",
(string_is_empty(display_name) && (string_is_empty(display_name) &&
!string_is_empty(params->name)) ? params->name : display_name); !string_is_empty(params->name)) ? params->name : (!string_is_empty(display_name) ? display_name : "N/A"));
if(!remote_is_bound) if(!remote_is_bound)
{ {
@ -182,7 +183,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
snprintf(msg, sizeof(msg), "%s %s #%u.", snprintf(msg, sizeof(msg), "%s %s #%u.",
(string_is_empty(display_name) && (string_is_empty(display_name) &&
!string_is_empty(params->name)) !string_is_empty(params->name))
? params->name : display_name, ? params->name : (!string_is_empty(display_name) ? display_name : "N/A"),
msg_hash_to_str(MSG_DEVICE_CONFIGURED_IN_PORT), msg_hash_to_str(MSG_DEVICE_CONFIGURED_IN_PORT),
params->idx); params->idx);