mirror of
https://github.com/Polprzewodnikowy/N64FlashcartMenu.git
synced 2024-11-30 06:24:14 +01:00
Fix merge
This commit is contained in:
parent
30a27ca52e
commit
657651ae14
@ -111,7 +111,7 @@ rom_patch_load_err_t rom_patch_info_load (char *path)
|
|||||||
FIL fil;
|
FIL fil;
|
||||||
rom_patch_load_err_t err;
|
rom_patch_load_err_t err;
|
||||||
|
|
||||||
if (f_open(&fil, strip_sd_prefix(path), FA_READ) != FR_OK) {
|
if (f_open(&fil, strip_fs_prefix(path), FA_READ) != FR_OK) {
|
||||||
return PATCH_ERR_NO_FILE;
|
return PATCH_ERR_NO_FILE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,6 +136,8 @@ static bool load_directory (menu_t *menu) {
|
|||||||
entry->type = ENTRY_TYPE_DISK;
|
entry->type = ENTRY_TYPE_DISK;
|
||||||
}else if (file_has_extensions(entry->name, emulator_extensions)) {
|
}else if (file_has_extensions(entry->name, emulator_extensions)) {
|
||||||
entry->type = ENTRY_TYPE_EMULATOR;
|
entry->type = ENTRY_TYPE_EMULATOR;
|
||||||
|
} else if (file_has_extensions(entry->name, patch_extensions)) {
|
||||||
|
entry->type = ENTRY_TYPE_ROM_PATCH;
|
||||||
} else if (file_has_extensions(entry->name, save_extensions)) {
|
} else if (file_has_extensions(entry->name, save_extensions)) {
|
||||||
entry->type = ENTRY_TYPE_SAVE;
|
entry->type = ENTRY_TYPE_SAVE;
|
||||||
} else if (file_has_extensions(entry->name, image_extensions)) {
|
} else if (file_has_extensions(entry->name, image_extensions)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user