diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 3c98971515..543baffa1e 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1059,7 +1059,6 @@ static int generic_action_ok(const char *path, strlcpy(settings->path.menu_wallpaper, action_path, sizeof(settings->path.menu_wallpaper)); task_push_image_load(action_path, - MENU_ENUM_LABEL_CB_MENU_WALLPAPER, menu_display_handle_wallpaper_upload, NULL); } break; diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 6da387fc1a..a63c3c42b9 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -1566,7 +1566,6 @@ static void mui_context_reset(void *data) mui_context_reset_textures(mui); task_push_image_load(settings->path.menu_wallpaper, - MENU_ENUM_LABEL_CB_MENU_WALLPAPER, menu_display_handle_wallpaper_upload, NULL); } diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c index d15bf03ff5..329c7061c0 100644 --- a/menu/drivers/nuklear.c +++ b/menu/drivers/nuklear.c @@ -376,7 +376,6 @@ static void nk_menu_context_reset(void *data) nk_menu_context_reset_textures(nk, iconpath); task_push_image_load(settings->path.menu_wallpaper, - MENU_ENUM_LABEL_CB_MENU_WALLPAPER, menu_display_handle_wallpaper_upload, NULL); } diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 76e6735220..50e702c9f1 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -998,7 +998,6 @@ static void xmb_update_thumbnail_image(void *data) if (path_file_exists(xmb->thumbnail_file_path)) task_push_image_load(xmb->thumbnail_file_path, - MENU_ENUM_LABEL_CB_MENU_THUMBNAIL, menu_display_handle_thumbnail_upload, NULL); else if (xmb->depth == 1) xmb->thumbnail = 0; @@ -1012,7 +1011,6 @@ static void xmb_update_savestate_thumbnail_image(void *data) if (path_file_exists(xmb->savestate_thumbnail_file_path)) task_push_image_load(xmb->savestate_thumbnail_file_path, - MENU_ENUM_LABEL_CB_MENU_SAVESTATE_THUMBNAIL, menu_display_handle_savestate_thumbnail_upload, NULL); else xmb->savestate_thumbnail = 0; @@ -1356,7 +1354,6 @@ static void xmb_list_switch_new(xmb_handle_t *xmb, if(path_file_exists(path)) { task_push_image_load(path, - MENU_ENUM_LABEL_CB_MENU_WALLPAPER, menu_display_handle_wallpaper_upload, NULL); strlcpy(xmb->background_file_path, path, sizeof(xmb->background_file_path)); @@ -3462,7 +3459,6 @@ static void xmb_context_reset_background(const char *iconpath) if (path_file_exists(path)) task_push_image_load(path, - MENU_ENUM_LABEL_CB_MENU_WALLPAPER, menu_display_handle_wallpaper_upload, NULL); } diff --git a/tasks/task_image.c b/tasks/task_image.c index eb41976b49..f0c60543cd 100644 --- a/tasks/task_image.c +++ b/tasks/task_image.c @@ -325,22 +325,18 @@ bool task_image_load_handler(retro_task_t *task) return true; } -bool task_push_image_load(const char *fullpath, - enum msg_hash_enums enum_idx, retro_task_callback_t cb, void *user_data) +bool task_push_image_load(const char *fullpath, retro_task_callback_t cb, void *user_data) { nbio_handle_t *nbio = NULL; - retro_task_t *t = NULL; struct nbio_image_handle *image = NULL; bool supports_rgba = video_driver_supports_rgba(); + retro_task_t *t = (retro_task_t*)calloc(1, sizeof(*t)); - if (enum_idx == MSG_UNKNOWN) - goto error_msg; - - t = (retro_task_t*)calloc(1, sizeof(*t)); if (!t) goto error_msg; nbio = (nbio_handle_t*)calloc(1, sizeof(*nbio)); + if (!nbio) goto error; diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h index 0eca647a0e..3830a0e3eb 100644 --- a/tasks/tasks_internal.h +++ b/tasks/tasks_internal.h @@ -111,7 +111,6 @@ bool task_push_netplay_lan_scan(void); #endif bool task_push_image_load(const char *fullpath, - enum msg_hash_enums enum_idx, retro_task_callback_t cb, void *userdata); #ifdef HAVE_LIBRETRODB