ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't show 'Filter by supported extensions' for anything other than 

'Load Content'-type file browser instances
This commit is contained in:
twinaphex 2016-07-16 17:17:58 +02:00
parent 4044185eaf
commit 9fe2ae4a0a
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
menu/menu_displaylist.c
View File

@ -3419,7 +3419,8 @@ static int menu_displaylist_parse_cores(
static int menu_displaylist_parse_generic( static int menu_displaylist_parse_generic(
menu_handle_t *menu, menu_handle_t *menu,
menu_displaylist_info_t *info, menu_displaylist_info_t *info,
enum menu_displaylist_ctl_state type) enum menu_displaylist_ctl_state type,
bool extensions_honored)
{ {
size_t i, list_size; size_t i, list_size;
bool path_is_compressed = false; bool path_is_compressed = false;
@ -3443,6 +3444,9 @@ static int menu_displaylist_parse_generic(
if (string_is_equal(info->label, msg_hash_to_str(MENU_ENUM_LABEL_SCAN_FILE))) if (string_is_equal(info->label, msg_hash_to_str(MENU_ENUM_LABEL_SCAN_FILE)))
filter_ext = false; filter_ext = false;
if (extensions_honored)
filter_ext = true;
if (path_is_compressed) if (path_is_compressed)
str_list = compressed_file_list_new(info->path, info->exts); str_list = compressed_file_list_new(info->path, info->exts);
else else
@ -3610,11 +3614,12 @@ static int menu_displaylist_parse_generic(
if (BIT32_GET(filebrowser_types, FILEBROWSER_SCAN_DIR)) if (BIT32_GET(filebrowser_types, FILEBROWSER_SCAN_DIR))
return 0; return 0;
menu_entries_prepend(info->list, if (!extensions_honored)
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE), menu_entries_prepend(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE),
MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE, msg_hash_to_str(MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE),
0, 0 ,0); MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
0, 0 ,0);
return 0; return 0;
} }
@ -3838,6 +3843,7 @@ void menu_displaylist_reset_filebrowser(void)
bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
{ {
size_t i; size_t i;
bool extensions_honored = false;
menu_ctx_displaylist_t disp_list; menu_ctx_displaylist_t disp_list;
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
video_shader_ctx_t shader_info; video_shader_ctx_t shader_info;
@ -5609,9 +5615,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
info->need_push = true; info->need_push = true;
} }
break; break;
case DISPLAYLIST_DEFAULT:
case DISPLAYLIST_DATABASES: case DISPLAYLIST_DATABASES:
case DISPLAYLIST_CORES_DETECTED:
case DISPLAYLIST_SHADER_PASS: case DISPLAYLIST_SHADER_PASS:
case DISPLAYLIST_SHADER_PRESET: case DISPLAYLIST_SHADER_PRESET:
case DISPLAYLIST_DATABASE_CURSORS: case DISPLAYLIST_DATABASE_CURSORS:
@ -5624,8 +5628,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_REMAP_FILES: case DISPLAYLIST_REMAP_FILES:
case DISPLAYLIST_RECORD_CONFIG_FILES: case DISPLAYLIST_RECORD_CONFIG_FILES:
case DISPLAYLIST_CONFIG_FILES: case DISPLAYLIST_CONFIG_FILES:
extensions_honored = true;
/* fall-through */
case DISPLAYLIST_DEFAULT:
case DISPLAYLIST_CORES_DETECTED:
case DISPLAYLIST_CONTENT_HISTORY: case DISPLAYLIST_CONTENT_HISTORY:
if (menu_displaylist_parse_generic(menu, info, type) == 0) if (menu_displaylist_parse_generic(menu, info, type, extensions_honored) == 0)
{ {
info->need_refresh = true; info->need_refresh = true;
info->need_push = true; info->need_push = true;