ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-22 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when playing same music again in Noah #712

Browse Source
This commit is contained in:
Cong
2025-06-29 15:09:53 +10:00
parent 39c0dce2a3
commit abc2116c6b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cdogs/music.c
View File

@@ -213,6 +213,8 @@ void MusicPlayChunk(MusicPlayer *mp, const MusicType type, MusicChunk *chunk)
{ {
mp->type = MUSIC_SRC_DYNAMIC; mp->type = MUSIC_SRC_DYNAMIC;
mp->u.dynamic = chunk->u.Music; mp->u.dynamic = chunk->u.Music;
// Mark music as null so it can be dynamically loaded again
chunk->u.Music = NULL;
PlayMusic(mp); PlayMusic(mp);
} }
else else
@@ -343,9 +345,7 @@ void MusicPlayFromChunk(
chunk->GetData) chunk->GetData)
{ {
chunk->isMusic = chunk->GetData(chunk, chunk->Data); chunk->isMusic = chunk->GetData(chunk, chunk->Data);
CFREE(chunk->Data); // Note: don't free the data; we need to reload it after it is freed in MusicStop
chunk->Data = NULL;
chunk->GetData = NULL;
} }
MusicPlayChunk(mp, type, chunk); MusicPlayChunk(mp, type, chunk);
} }