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

Improve content_load_wrapper - pushing to the history list should work again

Browse Source
This commit is contained in:
twinaphex 2016-05-17 07:36:18 +02:00
parent c19a39f49c
commit 0d850b9bda
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tasks/task_content.c
View File

@ -22,6 +22,7 @@
#include <errno.h>
#include <file/file_path.h>
#include <string/stdstring.h>
#ifdef HAVE_MENU
#include "../menu/menu_driver.h"
@ -1842,9 +1843,10 @@ static bool content_load_wrapper(
char msg[PATH_MAX_LENGTH];
char *fullpath = NULL;
runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
if (launched_from_menu)
{
runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath);
/* redraw menu frame */
menu_display_set_msg_force(true);
menu_driver_ctl(RARCH_MENU_CTL_RENDER, NULL);
@ -1863,17 +1865,17 @@ static bool content_load_wrapper(
snprintf(msg, sizeof(msg), "INFO - Loading %s ...", name);
runloop_msg_queue_push(msg, 1, 1, false);
}
}
/* Push entry to top of playlist */
if (*fullpath ||
menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL))
{
struct retro_system_info *info = NULL;
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET,
&info);
content_push_to_history_playlist(true, fullpath, info);
playlist_write_file(g_defaults.history);
}
/* Push entry to top of playlist */
if (!string_is_empty(fullpath) ||
menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL))
{
struct retro_system_info *info = NULL;
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET,
&info);
content_push_to_history_playlist(true, fullpath, info);
playlist_write_file(g_defaults.history);
}
return true;
@ -1881,9 +1883,11 @@ static bool content_load_wrapper(
error:
if (launched_from_menu)
{
if (*fullpath)
if (!string_is_empty(fullpath) && !string_is_empty(name))
{
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;
}