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

Revert "Don't use rarch_task_push_image inside xmb_context_reset_background"

Browse Source 
This reverts commit 40e1082cdaf291a3381635b8546943307f0c2ea3.
This commit is contained in:
twinaphex 2016-05-23 22:53:09 +02:00
parent 59e465ea8c
commit 0bd999faa5
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
menu/drivers/xmb.c
View File

@ -2785,7 +2785,7 @@ static void xmb_context_reset_textures(
xmb->add_tab_node.zoom = xmb->categories.active.zoom; xmb->add_tab_node.zoom = xmb->categories.active.zoom;
} }
static void xmb_context_reset_background(xmb_handle_t *xmb, const char *iconpath) static void xmb_context_reset_background(const char *iconpath)
{ {
char path[PATH_MAX_LENGTH] = {0}; char path[PATH_MAX_LENGTH] = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -2794,13 +2794,10 @@ static void xmb_context_reset_background(xmb_handle_t *xmb, const char *iconpath
if (*settings->path.menu_wallpaper) if (*settings->path.menu_wallpaper)
strlcpy(path, settings->path.menu_wallpaper, sizeof(path)); strlcpy(path, settings->path.menu_wallpaper, sizeof(path));
if (path_file_exists(path)) if (path_file_exists(path))
{ rarch_task_push_image_load(path, "cb_menu_wallpaper",
struct texture_image ti = {0}; menu_display_handle_wallpaper_upload, NULL);
image_texture_load(&ti, path);
xmb_load_image(xmb, &ti, MENU_IMAGE_WALLPAPER);
image_texture_free(&ti);
}
} }
static void xmb_context_reset(void *data) static void xmb_context_reset(void *data)
@ -2829,7 +2826,7 @@ static void xmb_context_reset(void *data)
xmb_layout(xmb); xmb_layout(xmb);
xmb_font(xmb); xmb_font(xmb);
xmb_context_reset_textures(xmb, iconpath); xmb_context_reset_textures(xmb, iconpath);
xmb_context_reset_background(xmb, iconpath); xmb_context_reset_background(iconpath);
xmb_context_reset_horizontal_list(xmb, themepath); xmb_context_reset_horizontal_list(xmb, themepath);
if (!string_is_equal(xmb_thumbnails_ident(), "OFF")) if (!string_is_equal(xmb_thumbnails_ident(), "OFF"))