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

Revert "(task_content.c) Get rid of some more unnecessary gotos" 

This reverts commit 903501f183.
This commit is contained in:
libretroadmin 2025-07-22 17:26:15 +02:00
parent 13c6eb53c9
commit 051c5cff77
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tasks/task_content.c
View File

@ -2049,8 +2049,8 @@ bool task_push_load_content_from_playlist_from_menu(
/* Check whether specified core is already loaded /* Check whether specified core is already loaded
* > If so, content can be launched directly with * > If so, content can be launched directly with
* the currently loaded core */ * the currently loaded core */
if ( !force_core_reload if (!force_core_reload &&
&& retroarch_ctl(RARCH_CTL_IS_CORE_LOADED, (void*)core_path)) retroarch_ctl(RARCH_CTL_IS_CORE_LOADED, (void*)core_path))
{ {
if (!content_info->environ_get) if (!content_info->environ_get)
content_info->environ_get = menu_content_environment_get; content_info->environ_get = menu_content_environment_get;
@ -2060,9 +2060,12 @@ bool task_push_load_content_from_playlist_from_menu(
if (!string_is_empty(fullpath)) if (!string_is_empty(fullpath))
path_set(RARCH_PATH_CONTENT, fullpath); path_set(RARCH_PATH_CONTENT, fullpath);
/* Load content and update content history */ /* Load content */
if ((ret = content_load(content_info, p_content))) if (!(ret = content_load(content_info, p_content)))
task_push_to_history_list(p_content, true, false, false); goto end;
/* Update content history */
task_push_to_history_list(p_content, true, false, false);
goto end; goto end;
} }
@ -2088,17 +2091,17 @@ bool task_push_load_content_from_playlist_from_menu(
/* Load content /* Load content
* > On targets that do not support dynamic core loading, * > On targets that do not support dynamic core loading,
* command_event_cmd_exec() will fork a new instance */ * command_event_cmd_exec() will fork a new instance */
if ((ret = command_event_cmd_exec(p_content, if (!(ret = command_event_cmd_exec(p_content,
fullpath, &content_ctx, false))) fullpath, &content_ctx, false)))
{ goto end;
#ifndef HAVE_DYNAMIC #ifndef HAVE_DYNAMIC
/* No dynamic core loading support: if we reach /* No dynamic core loading support: if we reach
* this point then a new instance has been * this point then a new instance has been
* forked - have to shut down this one */ * forked - have to shut down this one */
retroarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL); retroarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL);
retroarch_menu_running_finished(true); retroarch_menu_running_finished(true);
#endif #endif
}
#ifndef HAVE_DYNAMIC #ifndef HAVE_DYNAMIC
end: end: