mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into qt_grid

Browse Source
This commit is contained in:
Brad Parker 2018-07-23 11:18:26 -04:00
commit b52995dd30
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/drivers/platform_psp.c
View File

@ -468,6 +468,11 @@ static int frontend_psp_parse_drive_list(void *data, bool load_content)
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
enum_idx, enum_idx,
FILE_TYPE_DIRECTORY, 0, 0); FILE_TYPE_DIRECTORY, 0, 0);
menu_entries_append_enum(list,
"imc0:/",
msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
enum_idx,
FILE_TYPE_DIRECTORY, 0, 0);
#else #else
menu_entries_append_enum(list, menu_entries_append_enum(list,
"ms0:/", "ms0:/",

5
input/input_mapper.c
View File

@ -124,7 +124,10 @@ void input_mapper_poll(input_mapper_t *handle)
if (remap_valid) if (remap_valid)
{ {
unsigned current_button_value = BIT256_GET(current_input, j); unsigned current_button_value = BIT256_GET(current_input, j);
#ifdef HAVE_OVERLAY
if (poll_overlay && i == 0)
current_button_value |= input_overlay_key_pressed(overlay_ptr, j);
#endif
if ((current_button_value == 1) && (j != remap_button)) if ((current_button_value == 1) && (j != remap_button))
{ {
MAPPER_SET_KEY (handle, MAPPER_SET_KEY (handle,