mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use rarch_task_push_content_load_default

Browse Source
This commit is contained in:
twinaphex 2016-05-16 13:43:14 +02:00
parent 9846aeb53a
commit 57fedb9fa8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runloop.c
View File

@ -57,6 +57,7 @@
#include "msg_hash.h"
#include "input/input_keyboard.h"
#include "tasks/tasks_internal.h"
#ifdef HAVE_MENU
#include "menu/menu_driver.h"
@ -745,14 +746,10 @@ bool runloop_prepare_dummy(void)
runloop_ctl(RUNLOOP_CTL_TASK_INIT, NULL);
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
#ifdef HAVE_MENU
if (!menu_content_ctl(MENU_CONTENT_CTL_LOAD, NULL))
{
rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
return false;
}
#endif
return true;
return rarch_task_push_content_load_default(
NULL, NULL,
true, CORE_TYPE_DUMMY,
NULL, NULL);
}

9
tasks/task_content.c
View File

@ -85,7 +85,7 @@ bool rarch_task_push_content_load_default(
break;
}
if (load_content)
if (load_content && type == CORE_TYPE_PLAIN)
{
settings_t *settings = config_get_ptr();
core_path = settings->path.libretro;
@ -104,8 +104,11 @@ bool rarch_task_push_content_load_default(
return false;
#ifdef HAVE_MENU
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUIT, NULL);
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
if (type != CORE_TYPE_DUMMY)
{
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUIT, NULL);
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
}
#endif
return true;