fix audio crash when trying to detect BGM_DISABLED (#3150)

This commit is contained in:
Adam Bird
2023-08-30 13:07:21 -04:00
committed by GitHub
parent 7c31eafc1e
commit bea24fcde7
2 changed files with 19 additions and 11 deletions

View File

@@ -486,8 +486,10 @@ void AudioLoad_AsyncLoadFont(s32 fontId, s32 arg1, s32 retData, OSMesgQueue* ret
u8* AudioLoad_GetFontsForSequence(s32 seqId, u32* outNumFonts) {
s32 index;
if (seqId == NA_BGM_DISABLED)
return NULL;
// Check for NA_BGM_DISABLED and account for seqId that are stripped with `& 0xFF` by the caller
if (seqId == NA_BGM_DISABLED || seqId == 0xFF) {
return NULL;
}
u16 newSeqId = AudioEditor_GetReplacementSeq(seqId);
if (newSeqId > sequenceMapSize || !sequenceMap[newSeqId]) {