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

Refine how 'Start Core' works - if a core supports starting 

with no content, 'Start Core' will do somethign
This commit is contained in:
twinaphex 2016-01-25 06:10:37 +01:00
parent 7a0daf2cef
commit 8cc3eb3193
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
menu/cbs/menu_cbs_ok.c
View File

@ -688,17 +688,7 @@ static int generic_action_ok(const char *path,
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, action_path); runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, action_path);
event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL);
#if defined(HAVE_DYNAMIC) #if !defined(HAVE_DYNAMIC)
/* No content needed for this core, load core immediately. */
if (menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL) && settings->set_supports_no_game_enable)
{
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
if (rarch_task_push_content_load_default(NULL, NULL, false, CORE_TYPE_PLAIN, NULL, NULL))
action_ok_push_quick_menu();
}
else
ret = 0;
#else
/* Core selection on non-console just updates directory listing. /* Core selection on non-console just updates directory listing.
* Will take effect on new content load. */ * Will take effect on new content load. */
ret = -1; ret = -1;
@ -1753,11 +1743,16 @@ static int action_ok_rpl_entry(const char *path,
static int action_ok_start_core(const char *path, static int action_ok_start_core(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL); settings_t *settings = config_get_ptr();
event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL);
if (rarch_task_push_content_load_default( /* No content needed for this core, load core immediately. */
NULL, NULL, false, CORE_TYPE_PLAIN, NULL, NULL)) if (menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL))
action_ok_push_quick_menu(); {
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
if (rarch_task_push_content_load_default(NULL, NULL, false, CORE_TYPE_PLAIN, NULL, NULL))
action_ok_push_quick_menu();
}
return 0; return 0;
} }