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

Update menu_cbs_ok.c

This commit is contained in:
bparker06 2019-04-11 19:45:28 -04:00 committed by GitHub
parent 71bfd98012
commit 729f13cad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/cbs/menu_cbs_ok.c
View File

@ -1720,12 +1720,9 @@ static int action_ok_playlist_entry_collection(const char *path,
*subsystem_rom_list = NULL; *subsystem_rom_list = NULL;
unsigned i = 0; unsigned i = 0;
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return menu_cbs_exit(); return menu_cbs_exit();
new_core_path[0] = '\0'; new_core_path[0] = '\0';
tmp_playlist = playlist_get_cached(); tmp_playlist = playlist_get_cached();
@ -1736,6 +1733,7 @@ static int action_ok_playlist_entry_collection(const char *path,
if (!tmp_playlist) if (!tmp_playlist)
return menu_cbs_exit(); return menu_cbs_exit();
playlist_initialized = true; playlist_initialized = true;
} }
@ -1745,14 +1743,16 @@ static int action_ok_playlist_entry_collection(const char *path,
playlist_get_index(playlist, selection_ptr, playlist_get_index(playlist, selection_ptr,
&entry_path, &entry_label, &core_path, &core_name, NULL, NULL, &subsystem_ident, &subsystem_rom_list); &entry_path, &entry_label, &core_path, &core_name, NULL, NULL, &subsystem_ident, &subsystem_rom_list);
/* Subsystem codepath */ /* Subsystem codepath */
if (!string_is_empty(subsystem_ident) && subsystem_rom_list) if (!string_is_empty(subsystem_ident))
{ {
content_ctx_info_t content_info = {0}; content_ctx_info_t content_info = {0};
task_push_load_new_core(core_path, NULL, task_push_load_new_core(core_path, NULL,
&content_info, CORE_TYPE_PLAIN, NULL, NULL); &content_info, CORE_TYPE_PLAIN, NULL, NULL);
content_clear_subsystem(); content_clear_subsystem();
if (!content_set_subsystem_by_name(subsystem_ident)) if (!content_set_subsystem_by_name(subsystem_ident))
{ {
RARCH_LOG("[playlist] subsystem not found in implementation\n"); RARCH_LOG("[playlist] subsystem not found in implementation\n");
@ -1762,6 +1762,7 @@ static int action_ok_playlist_entry_collection(const char *path,
for (i = 0; i < subsystem_rom_list->size; i++) for (i = 0; i < subsystem_rom_list->size; i++)
content_add_subsystem(subsystem_rom_list->elems[i].data); content_add_subsystem(subsystem_rom_list->elems[i].data);
task_push_load_subsystem_with_core_from_menu( task_push_load_subsystem_with_core_from_menu(
NULL, &content_info, NULL, &content_info,
CORE_TYPE_PLAIN, NULL, NULL); CORE_TYPE_PLAIN, NULL, NULL);
@ -1769,7 +1770,6 @@ static int action_ok_playlist_entry_collection(const char *path,
return 1; return 1;
} }
/* Is the core path / name of the playlist entry not yet filled in? */ /* Is the core path / name of the playlist entry not yet filled in? */
if ( string_is_equal(core_path, file_path_str(FILE_PATH_DETECT)) if ( string_is_equal(core_path, file_path_str(FILE_PATH_DETECT))
&& string_is_equal(core_name, file_path_str(FILE_PATH_DETECT))) && string_is_equal(core_name, file_path_str(FILE_PATH_DETECT)))