From fa9fe88547d2a29e5bc433efec73e05396cf30df Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 19 May 2017 02:39:33 +0200 Subject: [PATCH] Fix filebrowser issues --- menu/cbs/menu_cbs_ok.c | 4 ++-- menu/widgets/menu_filebrowser.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index e49c2fb75b..9be1824309 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -251,7 +251,6 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_FILE_BROWSER_SELECT_DIR: - filebrowser_set_type(FILEBROWSER_SELECT_DIR); if (path) strlcpy(menu->deferred_path, path, sizeof(menu->deferred_path)); @@ -351,7 +350,6 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_CONTENT_COLLECTION_LIST: - filebrowser_set_type(FILEBROWSER_SELECT_COLLECTION); info.type = type; info.directory_ptr = idx; 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, 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, 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, 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)); return generic_action_ok_displaylist_push(path, NULL, label, type, idx, entry_idx, ACTION_OK_DL_FILE_BROWSER_SELECT_DIR); diff --git a/menu/widgets/menu_filebrowser.c b/menu/widgets/menu_filebrowser.c index 8dfe66c996..5be8df4f7f 100644 --- a/menu/widgets/menu_filebrowser.c +++ b/menu/widgets/menu_filebrowser.c @@ -49,10 +49,7 @@ void filebrowser_clear_type(void) void filebrowser_set_type(enum filebrowser_enums type) { - if ( (filebrowser_types != FILEBROWSER_SELECT_FILE) - && (filebrowser_types != FILEBROWSER_SELECT_IMAGE) - ) - filebrowser_types = type; + filebrowser_types = type; } void filebrowser_parse(void *data, unsigned type_data)