stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-06 01:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
mazmazz 2018-09-18 12:56:16 -04:00
commit 555f4329a5
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

@ -1144,6 +1144,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)
{ {
@ -1153,12 +1155,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()