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

Fix filebrowser issues

Browse Source
This commit is contained in:
twinaphex 2017-05-19 02:39:33 +02:00
parent 236f5b3514
commit fa9fe88547
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/cbs/menu_cbs_ok.c
View File

@ -251,7 +251,6 @@ int generic_action_ok_displaylist_push(const char *path,
dl_type = DISPLAYLIST_GENERIC; dl_type = DISPLAYLIST_GENERIC;
break; break;
case ACTION_OK_DL_FILE_BROWSER_SELECT_DIR: case ACTION_OK_DL_FILE_BROWSER_SELECT_DIR:
filebrowser_set_type(FILEBROWSER_SELECT_DIR);
if (path) if (path)
strlcpy(menu->deferred_path, path, strlcpy(menu->deferred_path, path,
sizeof(menu->deferred_path)); sizeof(menu->deferred_path));
@ -351,7 +350,6 @@ int generic_action_ok_displaylist_push(const char *path,
dl_type = DISPLAYLIST_GENERIC; dl_type = DISPLAYLIST_GENERIC;
break; break;
case ACTION_OK_DL_CONTENT_COLLECTION_LIST: case ACTION_OK_DL_CONTENT_COLLECTION_LIST:
filebrowser_set_type(FILEBROWSER_SELECT_COLLECTION);
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
info_path = settings->paths.directory_playlist; info_path = settings->paths.directory_playlist;
@ -3273,6 +3271,7 @@ static int action_ok_browse_url_list(const char *path,
static int action_ok_content_collection_list(const char *path, static int action_ok_content_collection_list(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_set_type(FILEBROWSER_SELECT_COLLECTION);
return generic_action_ok_displaylist_push(path, NULL, label, type, idx, return generic_action_ok_displaylist_push(path, NULL, label, type, idx,
entry_idx, ACTION_OK_DL_CONTENT_COLLECTION_LIST); entry_idx, ACTION_OK_DL_CONTENT_COLLECTION_LIST);
} }
@ -3635,6 +3634,7 @@ int action_ok_push_generic_list(const char *path,
int action_ok_push_filebrowser_list_dir_select(const char *path, int action_ok_push_filebrowser_list_dir_select(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_set_type(FILEBROWSER_SELECT_DIR);
strlcpy(filebrowser_label, label, sizeof(filebrowser_label)); strlcpy(filebrowser_label, label, sizeof(filebrowser_label));
return generic_action_ok_displaylist_push(path, NULL, label, type, idx, return generic_action_ok_displaylist_push(path, NULL, label, type, idx,
entry_idx, ACTION_OK_DL_FILE_BROWSER_SELECT_DIR); entry_idx, ACTION_OK_DL_FILE_BROWSER_SELECT_DIR);

5
menu/widgets/menu_filebrowser.c
View File

@ -49,10 +49,7 @@ void filebrowser_clear_type(void)
void filebrowser_set_type(enum filebrowser_enums type) void filebrowser_set_type(enum filebrowser_enums type)
{ {
if ( (filebrowser_types != FILEBROWSER_SELECT_FILE) filebrowser_types = type;
&& (filebrowser_types != FILEBROWSER_SELECT_IMAGE)
)
filebrowser_types = type;
} }
void filebrowser_parse(void *data, unsigned type_data) void filebrowser_parse(void *data, unsigned type_data)