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

Menu now loads file from carchive correctly in the cases of deferred core and the standard case (like MENU_FILE_PLAIN)

This commit is contained in:
Timo Strunk 2014-09-12 17:52:16 +02:00
parent 8d3e89cc7e
commit 6386bfdb14
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
frontend/menu/backend/menu_common_backend.c
View File

@ -1198,6 +1198,9 @@ static int menu_action_ok(const char *menu_path,
menu_flush_stack_type(driver.menu->menu_stack, MENU_SETTINGS); menu_flush_stack_type(driver.menu->menu_stack, MENU_SETTINGS);
return -1; return -1;
#ifdef HAVE_COMPRESSION
case MENU_FILE_IN_CARCHIVE:
#endif
case MENU_FILE_PLAIN: case MENU_FILE_PLAIN:
if (!strcmp(menu_label, "detect_core_list")) if (!strcmp(menu_label, "detect_core_list"))
{ {
@ -1205,6 +1208,7 @@ static int menu_action_ok(const char *menu_path,
menu_path, path, driver.menu->deferred_path, menu_path, path, driver.menu->deferred_path,
sizeof(driver.menu->deferred_path)); sizeof(driver.menu->deferred_path));
if (ret == -1) if (ret == -1)
{ {
@ -1237,8 +1241,16 @@ static int menu_action_ok(const char *menu_path,
} }
else else
{ {
fill_pathname_join(g_extern.fullpath, menu_path, path, if (type == MENU_FILE_IN_CARCHIVE)
sizeof(g_extern.fullpath)); {
fill_pathname_join_delim(g_extern.fullpath, menu_path, path,
'#',sizeof(g_extern.fullpath));
}
else
{
fill_pathname_join(g_extern.fullpath, menu_path, path,
sizeof(g_extern.fullpath));
}
menu_common_load_content(); menu_common_load_content();
rarch_main_command(RARCH_CMD_LOAD_CONTENT_PERSIST); rarch_main_command(RARCH_CMD_LOAD_CONTENT_PERSIST);
@ -1358,27 +1370,11 @@ static int menu_action_ok(const char *menu_path,
{ {
char cat_path[PATH_MAX]; char cat_path[PATH_MAX];
fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path)); fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path));
menu_entries_push(driver.menu->menu_stack, menu_entries_push(driver.menu->menu_stack,
cat_path, menu_label, type, driver.menu->selection_ptr); cat_path, menu_label, type, driver.menu->selection_ptr);
} }
return 0; return 0;
#ifdef HAVE_COMPRESSION
case MENU_FILE_IN_CARCHIVE:
fill_pathname_join(g_extern.fullpath, menu_path, path,
sizeof(g_extern.fullpath));
g_extern.is_carchive = true;
strncpy(g_extern.carchive_path, menu_path,
sizeof(g_extern.carchive_path));
menu_common_load_content();
return -1;
#endif
} }