stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-06 16:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt

Browse source
This commit is contained in:
mazmazz 2018-09-18 12:59:53 -04:00
commit 38afb85b47
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sdl/mixer_sound.c
View file

@ -1422,6 +1422,8 @@ boolean I_PlaySong(boolean looping)
void I_StopSong(void) void I_StopSong(void)
{ {
I_StopFadingSong();
#ifdef HAVE_LIBGME #ifdef HAVE_LIBGME
if (gme) if (gme)
{ {
@ -1438,12 +1440,12 @@ void I_StopSong(void)
#endif #endif
if (music) if (music)
{ {
var_cleanup();
I_StopFadingSong();
Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes); Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes);
Mix_HookMusicFinished(NULL); Mix_HookMusicFinished(NULL);
Mix_HaltMusic(); Mix_HaltMusic();
} }
var_cleanup();
} }
void I_PauseSong() void I_PauseSong()