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

Should fix RMenu zip support.

This commit is contained in:
Themaister 2013-05-01 01:17:24 +02:00
parent be5022b9c5
commit 81e8a51728
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/menu/menu_common.c
View File

@ -495,6 +495,14 @@ void menu_init(void)
strlcpy(rgui->browser->current_dir.extensions, rgui->info.valid_extensions, strlcpy(rgui->browser->current_dir.extensions, rgui->info.valid_extensions,
sizeof(rgui->browser->current_dir.extensions)); sizeof(rgui->browser->current_dir.extensions));
// Look for zips to extract as well.
if (*rgui->info.valid_extensions)
{
strlcat(rgui->browser->current_dir.extensions, "|zip",
sizeof(rgui->browser->current_dir.extensions));
}
strlcpy(rgui->browser->current_dir.root_dir, g_settings.rgui_browser_directory, strlcpy(rgui->browser->current_dir.root_dir, g_settings.rgui_browser_directory,
sizeof(rgui->browser->current_dir.root_dir)); sizeof(rgui->browser->current_dir.root_dir));

17
frontend/menu/rmenu.c
View File

@ -2473,18 +2473,7 @@ static int select_rom(void *data, uint64_t input)
if (driver.input->set_keybinds) if (driver.input->set_keybinds)
driver.input->set_keybinds(&key_label_b, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL)); driver.input->set_keybinds(&key_label_b, 0, 0, 0, (1ULL << KEYBINDS_ACTION_GET_BIND_LABEL));
char ext_buf[1024]; filebrowser_update(rgui->browser, input, rgui->browser->current_dir.extensions);
char *ext = NULL;
if (rgui->info.valid_extensions)
{
ext = ext_buf;
if (*rgui->info.valid_extensions)
snprintf(ext_buf, sizeof(ext_buf), "%s|zip", rgui->info.valid_extensions);
else
*ext_buf = '\0';
}
filebrowser_update(rgui->browser, input, ext);
if (input & (1ULL << DEVICE_NAV_B)) if (input & (1ULL << DEVICE_NAV_B))
{ {
@ -2507,13 +2496,13 @@ static int select_rom(void *data, uint64_t input)
{ {
const char * drive_map = menu_drive_mapping_previous(); const char * drive_map = menu_drive_mapping_previous();
if (drive_map != NULL) if (drive_map != NULL)
filebrowser_set_root_and_ext(rgui->browser, ext, drive_map); filebrowser_set_root_and_ext(rgui->browser, rgui->browser->current_dir.extensions, drive_map);
} }
else if (input & (1ULL << DEVICE_NAV_R1)) else if (input & (1ULL << DEVICE_NAV_R1))
{ {
const char * drive_map = menu_drive_mapping_next(); const char * drive_map = menu_drive_mapping_next();
if (drive_map != NULL) if (drive_map != NULL)
filebrowser_set_root_and_ext(rgui->browser, ext, drive_map); filebrowser_set_root_and_ext(rgui->browser, rgui->browser->current_dir.extensions, drive_map);
} }
else if ((input & (1ULL << DEVICE_NAV_X) || else if ((input & (1ULL << DEVICE_NAV_X) ||
(input & (1ULL << DEVICE_NAV_MENU)))) (input & (1ULL << DEVICE_NAV_MENU))))