ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup command_evnt_cmd_exec

This commit is contained in:
twinaphex 2020-07-11 16:00:42 +02:00
parent 46fd40b574
commit 8436b7fc6a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tasks/task_content.c
View File

@ -1436,15 +1436,6 @@ static bool command_event_cmd_exec(
bool launched_from_cli, bool launched_from_cli,
char **error_string) char **error_string)
{ {
#if defined(HAVE_DYNAMIC)
content_ctx_info_t content_info;
content_info.argc = 0;
content_info.argv = NULL;
content_info.args = NULL;
content_info.environ_get = menu_content_environment_get;
#endif
if (path_get(RARCH_PATH_CONTENT) != data) if (path_get(RARCH_PATH_CONTENT) != data)
{ {
path_clear(RARCH_PATH_CONTENT); path_clear(RARCH_PATH_CONTENT);
@ -1453,10 +1444,19 @@ static bool command_event_cmd_exec(
} }
#if defined(HAVE_DYNAMIC) #if defined(HAVE_DYNAMIC)
/* Loads content into currently selected core. */ {
if (!content_load(&content_info, p_content)) content_ctx_info_t content_info;
return false;
task_push_to_history_list(p_content, true, launched_from_cli, false); content_info.argc = 0;
content_info.argv = NULL;
content_info.args = NULL;
content_info.environ_get = menu_content_environment_get;
/* Loads content into currently selected core. */
if (!content_load(&content_info, p_content))
return false;
task_push_to_history_list(p_content, true, launched_from_cli, false);
}
#else #else
frontend_driver_set_fork(FRONTEND_FORK_CORE_WITH_ARGS); frontend_driver_set_fork(FRONTEND_FORK_CORE_WITH_ARGS);
#endif #endif