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

use persist load for normal loads, fixes exitspawn on consoles

This commit is contained in:
Toad King 2014-10-24 19:42:37 -05:00
parent c5f5c5f259
commit efcd479c4f
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/menu/menu_entries_cbs.c
View File

@ -114,9 +114,9 @@ unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480; unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
#endif #endif
static void common_load_content(void) static void common_load_content(bool persist)
{ {
rarch_main_command(RARCH_CMD_LOAD_CONTENT); rarch_main_command(persist ? RARCH_CMD_LOAD_CONTENT_PERSIST : RARCH_CMD_LOAD_CONTENT);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS); menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
driver.menu->msg_force = true; driver.menu->msg_force = true;
} }
@ -287,9 +287,7 @@ static int action_ok_core_load_deferred(const char *path,
strlcpy(g_extern.fullpath, driver.menu->deferred_path, strlcpy(g_extern.fullpath, driver.menu->deferred_path,
sizeof(g_extern.fullpath)); sizeof(g_extern.fullpath));
rarch_main_command(RARCH_CMD_LOAD_CONTENT); common_load_content(false);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
driver.menu->msg_force = true;
return -1; return -1;
} }
@ -313,9 +311,7 @@ static int action_ok_core_load(const char *path,
if (driver.menu->load_no_content) if (driver.menu->load_no_content)
{ {
*g_extern.fullpath = '\0'; *g_extern.fullpath = '\0';
rarch_main_command(RARCH_CMD_LOAD_CONTENT); common_load_content(false);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
driver.menu->msg_force = true;
return -1; return -1;
} }
@ -451,7 +447,7 @@ static int action_ok_file_load_with_detect_core(const char *path,
if (ret == -1) if (ret == -1)
{ {
rarch_main_command(RARCH_CMD_LOAD_CORE); rarch_main_command(RARCH_CMD_LOAD_CORE);
common_load_content(); common_load_content(false);
return -1; return -1;
} }
else if (ret == 0) else if (ret == 0)
@ -494,10 +490,7 @@ static int action_ok_file_load(const char *path,
fill_pathname_join(g_extern.fullpath, menu_path, path, fill_pathname_join(g_extern.fullpath, menu_path, path,
sizeof(g_extern.fullpath)); sizeof(g_extern.fullpath));
common_load_content(); common_load_content(true);
rarch_main_command(RARCH_CMD_LOAD_CONTENT_PERSIST);
menu_list_flush_stack(driver.menu->menu_list, MENU_SETTINGS);
driver.menu->msg_force = true;
return -1; return -1;
} }

2
retroarch.c
View File

@ -2165,7 +2165,9 @@ bool rarch_main_command(unsigned cmd)
switch (cmd) switch (cmd)
{ {
case RARCH_CMD_LOAD_CONTENT_PERSIST: case RARCH_CMD_LOAD_CONTENT_PERSIST:
#ifdef HAVE_DYNAMIC
rarch_main_command(RARCH_CMD_LOAD_CORE); rarch_main_command(RARCH_CMD_LOAD_CORE);
#endif
rarch_main_set_state(RARCH_ACTION_STATE_LOAD_CONTENT); rarch_main_set_state(RARCH_ACTION_STATE_LOAD_CONTENT);
break; break;
case RARCH_CMD_LOAD_CONTENT: case RARCH_CMD_LOAD_CONTENT: