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

Start writing rarch_task_push_content_load_default

Browse Source
This commit is contained in:
twinaphex 2016-05-16 14:27:11 +02:00
parent d4732d048e
commit 3cb26268ee
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tasks/task_content.c
View File

@ -42,10 +42,7 @@ static bool task_content_load(bool persist, bool load_content)
{
#ifdef HAVE_MENU
if (!menu_content_ctl(MENU_CONTENT_CTL_LOAD, NULL))
{
rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
return false;
}
#endif
}
else
@ -125,7 +122,7 @@ bool rarch_task_push_content_load_default(
runloop_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, (void*)fullpath);
if (!task_content_load(persist, load_content))
return false;
goto error;
#ifdef HAVE_MENU
if (type != CORE_TYPE_DUMMY)
@ -136,4 +133,21 @@ bool rarch_task_push_content_load_default(
#endif
return true;
error:
#ifdef HAVE_MENU
switch (mode)
{
case CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU:
rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
break;
default:
break;
}
#endif
return false;
}