mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-06-03 19:06:24 +02:00
parent 7d30885ab9
commit d6d757e240
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tasks/task_content.c
View File

@ -1699,26 +1699,6 @@ static bool command_event_cmd_exec(void *data)
return true; return true;
} }
static bool task_load_core(const char *core_path)
{
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
#ifdef HAVE_DYNAMIC
command_event(CMD_EVENT_LOAD_CORE, NULL);
#endif
return true;
}
static void task_push_quickmenu(enum content_mode_load mode, enum rarch_core_type type)
{
#ifdef HAVE_MENU
if (type != CORE_TYPE_DUMMY && mode != CONTENT_MODE_LOAD_FROM_CLI)
{
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUIT, NULL);
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
}
#endif
}
bool task_push_content_load_default( bool task_push_content_load_default(
const char *core_path, const char *core_path,
const char *fullpath, const char *fullpath,
@ -1845,8 +1825,9 @@ bool task_push_content_load_default(
case CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU: case CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_COMPANION_UI: case CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_COMPANION_UI:
case CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU: case CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU:
if (!task_load_core(core_path)) #ifdef HAVE_DYNAMIC
goto error; command_event(CMD_EVENT_LOAD_CORE, NULL);
#endif
break; break;
default: default:
break; break;
@ -1919,7 +1900,11 @@ bool task_push_content_load_default(
break; break;
default: default:
#ifdef HAVE_MENU #ifdef HAVE_MENU
task_push_quickmenu(mode, type); if (type != CORE_TYPE_DUMMY && mode != CONTENT_MODE_LOAD_FROM_CLI)
{
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUIT, NULL);
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
}
#endif #endif
break; break;
} }