mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

menu_content_load - cleanups

Browse Source
This commit is contained in:
twinaphex 2016-05-16 15:17:28 +02:00
parent 9c33d91e68
commit 3678c4e72a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasks/task_content.c
View File

@ -96,23 +96,24 @@ static bool menu_content_load(void)
menu_display_set_msg_force(true); menu_display_set_msg_force(true);
menu_driver_ctl(RARCH_MENU_CTL_RENDER, NULL); menu_driver_ctl(RARCH_MENU_CTL_RENDER, NULL);
if (*fullpath)
fill_pathname_base(name, fullpath, sizeof(name));
content_info.argc = 0; content_info.argc = 0;
content_info.argv = NULL; content_info.argv = NULL;
content_info.args = NULL; content_info.args = NULL;
content_info.environ_get = menu_content_environment_get; content_info.environ_get = menu_content_environment_get;
fill_pathname_base(name, fullpath, sizeof(name));
if (!content_load(&content_info)) if (!content_load(&content_info))
goto error; goto error;
/** Show loading OSD message */
if (*fullpath) if (*fullpath)
{ {
snprintf(msg, sizeof(msg), "INFO - Loading %s ...", name); snprintf(msg, sizeof(msg), "INFO - Loading %s ...", name);
runloop_msg_queue_push(msg, 1, 1, false); runloop_msg_queue_push(msg, 1, 1, false);
} }
/* Push entry to top of playlist */
if (*fullpath || if (*fullpath ||
menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL)) menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL))
{ {
@ -126,7 +127,8 @@ static bool menu_content_load(void)
return true; return true;
error: error:
snprintf(msg, sizeof(msg), "Failed to load %s.\n", name); if (*fullpath)
snprintf(msg, sizeof(msg), "Failed to load %s.\n", name);
runloop_msg_queue_push(msg, 1, 90, false); runloop_msg_queue_push(msg, 1, 90, false);
return false; return false;
} }