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

(Filebrowser) Fix 'Menu Wallpaper' setting

Browse Source
This commit is contained in:
twinaphex 2017-01-07 09:53:39 +01:00
parent f1acb16401
commit 61168a442f
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/cbs/menu_cbs_cancel.c
View File

@ -42,12 +42,18 @@ static int action_cancel_pop_default(const char *path,
RARCH_LOG("menu_label: %s\n", menu_label); RARCH_LOG("menu_label: %s\n", menu_label);
#endif #endif
if (!string_is_empty(menu_label) && if (!string_is_empty(menu_label))
{
if (
string_is_equal(menu_label, string_is_equal(menu_label,
msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST) msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST)
) ) ||
) string_is_equal(menu_label,
filebrowser_clear_type(); msg_hash_to_str(MENU_ENUM_LABEL_MENU_WALLPAPER)
)
)
filebrowser_clear_type();
}
menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &new_selection_ptr); menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &new_selection_ptr);
menu_entries_pop_stack(&new_selection_ptr, 0, 1); menu_entries_pop_stack(&new_selection_ptr, 0, 1);

2
menu/cbs/menu_cbs_ok.c
View File

@ -1652,7 +1652,7 @@ static int action_ok_menu_wallpaper(const char *path,
static int action_ok_menu_wallpaper_load(const char *path, static int action_ok_menu_wallpaper_load(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
filebrowser_clear_type();
return generic_action_ok(path, label, type, idx, entry_idx, return generic_action_ok(path, label, type, idx, entry_idx,
ACTION_OK_LOAD_WALLPAPER, MSG_UNKNOWN); ACTION_OK_LOAD_WALLPAPER, MSG_UNKNOWN);
} }

3
menu/menu_displaylist.c
View File

@ -6171,7 +6171,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
strlcpy(info->exts, "filt", sizeof(info->exts)); strlcpy(info->exts, "filt", sizeof(info->exts));
break; break;
case DISPLAYLIST_IMAGES: case DISPLAYLIST_IMAGES:
filebrowser_clear_type(); if (filebrowser_get_type() != FILEBROWSER_SELECT_IMAGE)
filebrowser_clear_type();
info->type_default = FILE_TYPE_IMAGE; info->type_default = FILE_TYPE_IMAGE;
{ {
union string_list_elem_attr attr; union string_list_elem_attr attr;

2
menu/widgets/menu_filebrowser.c
View File

@ -224,6 +224,8 @@ void filebrowser_parse(void *data, unsigned type_data, bool extensions_honored)
else else
file_type = FILE_TYPE_IMAGE; file_type = FILE_TYPE_IMAGE;
#endif #endif
if (filebrowser_types == FILEBROWSER_SELECT_IMAGE)
file_type = FILE_TYPE_IMAGE;
break; break;
default: default:
break; break;