Fix merge

This commit is contained in:
Robin Jones 2024-05-19 17:54:50 +01:00
parent 30a27ca52e
commit 657651ae14
2 changed files with 3 additions and 1 deletions

View File

@ -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;
} }

View 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)) {