mirror of
https://github.com/libretro/RetroArch
synced 2025-04-01 04:20:27 +00:00
Not necessary for content_ctx to be passed either
This commit is contained in:
parent
58417e56b7
commit
9cc055bf93
@ -1297,7 +1297,6 @@ static void menu_content_environment_get(int *argc, char *argv[],
|
|||||||
* Will push the content entry to the history playlist.
|
* Will push the content entry to the history playlist.
|
||||||
**/
|
**/
|
||||||
static void task_push_to_history_list(
|
static void task_push_to_history_list(
|
||||||
content_information_ctx_t *content_ctx,
|
|
||||||
bool launched_from_menu,
|
bool launched_from_menu,
|
||||||
bool launched_from_cli)
|
bool launched_from_cli)
|
||||||
{
|
{
|
||||||
@ -1461,8 +1460,7 @@ static bool command_event_cmd_exec(const char *data,
|
|||||||
/* Loads content into currently selected core. */
|
/* Loads content into currently selected core. */
|
||||||
if (!content_load(&content_info))
|
if (!content_load(&content_info))
|
||||||
return false;
|
return false;
|
||||||
task_push_to_history_list(content_ctx,
|
task_push_to_history_list(true, launched_from_cli);
|
||||||
true, launched_from_cli);
|
|
||||||
#else
|
#else
|
||||||
frontend_driver_set_fork(FRONTEND_FORK_CORE_WITH_ARGS);
|
frontend_driver_set_fork(FRONTEND_FORK_CORE_WITH_ARGS);
|
||||||
#endif
|
#endif
|
||||||
@ -1599,8 +1597,7 @@ bool task_push_start_dummy_core(content_ctx_info_t *content_info)
|
|||||||
ret = false;
|
ret = false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
task_push_to_history_list(&content_ctx,
|
task_push_to_history_list(false, false);
|
||||||
false, false);
|
|
||||||
|
|
||||||
if (content_ctx.name_ips)
|
if (content_ctx.name_ips)
|
||||||
free(content_ctx.name_ips);
|
free(content_ctx.name_ips);
|
||||||
@ -1790,8 +1787,7 @@ bool task_push_start_current_core(content_ctx_info_t *content_info)
|
|||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
task_push_to_history_list(&content_ctx,
|
task_push_to_history_list(true, false);
|
||||||
true, false);
|
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
/* Push quick menu onto menu stack */
|
/* Push quick menu onto menu stack */
|
||||||
@ -1917,9 +1913,7 @@ bool task_push_load_content_with_new_core_from_menu(
|
|||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
task_push_to_history_list(&content_ctx,
|
task_push_to_history_list(true, false);
|
||||||
true, false);
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
command_event_cmd_exec(path_get(RARCH_PATH_CONTENT), &content_ctx,
|
command_event_cmd_exec(path_get(RARCH_PATH_CONTENT), &content_ctx,
|
||||||
false, &error_string);
|
false, &error_string);
|
||||||
@ -2030,7 +2024,7 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
|
|||||||
ret = content_load(content_info);
|
ret = content_load(content_info);
|
||||||
|
|
||||||
if (ret)
|
if (ret)
|
||||||
task_push_to_history_list(&content_ctx, true, loading_from_cli);
|
task_push_to_history_list(true, loading_from_cli);
|
||||||
|
|
||||||
end:
|
end:
|
||||||
if (content_ctx.name_ips)
|
if (content_ctx.name_ips)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user