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

Cleanups

This commit is contained in:
twinaphex 2016-05-28 23:56:07 +02:00
parent 2859f6f18d
commit bf6fa07b25
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tasks/task_content.c
View File

@ -1747,6 +1747,17 @@ bool task_push_content_load_default(
} }
#endif #endif
switch (mode)
{
case CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE:
case CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_NOTHING_WITH_NET_RETROPAD_CORE_FROM_MENU:
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
break;
default:
break;
}
switch (mode) switch (mode)
{ {
case CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE: case CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE:
@ -1756,7 +1767,6 @@ bool task_push_content_load_default(
#endif #endif
runloop_ctl(RUNLOOP_CTL_DATA_DEINIT, NULL); runloop_ctl(RUNLOOP_CTL_DATA_DEINIT, NULL);
runloop_ctl(RUNLOOP_CTL_TASK_INIT, NULL); runloop_ctl(RUNLOOP_CTL_TASK_INIT, NULL);
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
if (!task_load_content(content_info, false)) if (!task_load_content(content_info, false))
goto error; goto error;
break; break;
@ -1765,14 +1775,12 @@ bool task_push_content_load_default(
goto error; goto error;
break; break;
case CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU: case CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU:
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
if (!task_load_content(content_info, true)) if (!task_load_content(content_info, true))
goto error; goto error;
break; break;
case CONTENT_MODE_LOAD_NOTHING_WITH_NET_RETROPAD_CORE_FROM_MENU: case CONTENT_MODE_LOAD_NOTHING_WITH_NET_RETROPAD_CORE_FROM_MENU:
#if defined(HAVE_NETPLAY) && defined(HAVE_NETWORK_GAMEPAD) #if defined(HAVE_NETPLAY) && defined(HAVE_NETWORK_GAMEPAD)
retroarch_set_current_core_type(CORE_TYPE_NETRETROPAD, true); retroarch_set_current_core_type(CORE_TYPE_NETRETROPAD, true);
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
if (!task_load_content(content_info, true)) if (!task_load_content(content_info, true))
goto error; goto error;
return true; return true;