CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-21 20:22:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1952 from fr500/master

Browse Source 
Proposals
This commit is contained in:
Twinaphex 2015-07-12 21:13:01 +02:00
commit 1ff9f89e7d
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core_info.c
View File

@ -380,6 +380,7 @@ bool core_info_list_get_display_name(core_info_list_t *core_info_list,
bool core_info_get_display_name(const char *path, char *s, size_t len)
{
char *core_name = NULL;
char *display_name = NULL;
config_file_t *conf = NULL;
if (!path_file_exists(path))
@ -393,6 +394,9 @@ bool core_info_get_display_name(const char *path, char *s, size_t len)
config_get_string(conf, "corename",
&core_name);
config_get_string(conf, "display_name",
&display_name);
config_file_free(conf);
if (!core_name)
@ -400,7 +404,7 @@ bool core_info_get_display_name(const char *path, char *s, size_t len)
if (!conf)
goto error;
strlcpy(s, core_name, len);
snprintf(s, len,"%s",display_name);
free(core_name);

1
input/drivers/android_input.c
View File

@ -643,7 +643,6 @@ static void handle_hotplug(android_input_t *android,
* We really need to find a way to detect useless input devices
* like gpio-keys in a general way.
*/
*port = 0;
strlcpy(name_buf, device_name, sizeof(name_buf));
}
else if (device_name[0] != '\0')

11
input/input_autodetect.c
View File

@ -112,8 +112,11 @@ static void input_autoconfigure_joypad_add(
autoconfig_params_t *params)
{
char msg[PATH_MAX_LENGTH] = {0};
char buf[PATH_MAX_LENGTH] = {0};
settings_t *settings = config_get_ptr();
config_get_array(conf, "input_display_name", buf, sizeof(buf));
/* This will be the case if input driver is reinitialized.
* No reason to spam autoconfigure messages every time. */
bool block_osd_spam = settings &&
@ -126,8 +129,12 @@ static void input_autoconfigure_joypad_add(
input_autoconfigure_joypad_conf(conf,
settings->input.autoconf_binds[params->idx]);
snprintf(msg, sizeof(msg), "Device port #%u (%s) configured.",
params->idx, params->name);
if (buf[0] != '\0' || strcmp(buf, ""))
snprintf(msg, sizeof(msg), "Device %s in port #%u configured as %s",
params->name, params->idx, buf);
else
snprintf(msg, sizeof(msg), "Device %s in port #%u configured",
params->name, params->idx);
if (!block_osd_spam)
rarch_main_msg_queue_push(msg, 0, 60, false);