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

Merge pull request #5789 from fr500/master

Browse Source 
Fix some issues with contentless cores
This commit is contained in:
Twinaphex 2017-11-26 17:57:01 +01:00 committed by GitHub
commit a7eea8349c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
command.c
View File

@ -1805,6 +1805,7 @@ bool command_event(enum event_command cmd, void *data)
case CMD_EVENT_LOAD_CORE_PERSIST:
{
#ifdef HAVE_MENU
path_clear_all();
core_info_ctx_find_t info_find;
rarch_system_info_t *system_info = runloop_get_system_info();
struct retro_system_info *system = &system_info->info;

26
tasks/task_content.c
View File

@ -173,27 +173,21 @@ static void content_load_init_wrap(
*argc = 0;
argv[(*argc)++] = strdup("retroarch");
#ifdef HAVE_DYNAMIC
if (!args->no_content)
if (args->content_path)
{
#endif
if (args->content_path)
{
RARCH_LOG("Using content: %s.\n", args->content_path);
argv[(*argc)++] = strdup(args->content_path);
}
RARCH_LOG("Using content: %s.\n", args->content_path);
argv[(*argc)++] = strdup(args->content_path);
}
#ifdef HAVE_MENU
else
{
RARCH_LOG("%s\n",
msg_hash_to_str(MSG_NO_CONTENT_STARTING_DUMMY_CORE));
argv[(*argc)++] = strdup("--menu");
}
#endif
#ifdef HAVE_DYNAMIC
else
{
RARCH_LOG("%s\n",
msg_hash_to_str(MSG_NO_CONTENT_STARTING_DUMMY_CORE));
argv[(*argc)++] = strdup("--menu");
}
#endif
if (args->sram_path)
{
argv[(*argc)++] = strdup("-s");