mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 04:14:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7502 from fr500/upstream

Browse Source 
Couple fixes
This commit is contained in:
Twinaphex 2018-10-29 01:55:15 +01:00 committed by GitHub
commit d938861f1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/drivers/xmb.c
View File

@ -2531,9 +2531,8 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
return xmb->textures.list[XMB_TEXTURE_ROOM_RELAY];
#endif
case MENU_SETTING_ACTION:
if (xmb->depth <= 3)
if (xmb->depth == 3)
return xmb->textures.list[XMB_TEXTURE_SETTING];
default:
return xmb->textures.list[XMB_TEXTURE_SUBSETTING];
}

7
tasks/task_content.c
View File

@ -615,10 +615,11 @@ static bool content_file_load(
error_string))
goto error;
#endif
RARCH_LOG("%s\n", msg_hash_to_str(MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT));
content_rom_crc = file_crc32(0, path);
RARCH_LOG("CRC32: 0x%x .\n", (unsigned)content_rom_crc);
}
RARCH_LOG("%s\n", msg_hash_to_str(MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT));
content_rom_crc = file_crc32(0, path);
RARCH_LOG("CRC32: 0x%x .\n", (unsigned)content_rom_crc);
}
load_info.content = content;