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

Fix MIDI music not reloading sometimes on settings change

Browse source
This commit is contained in:
mazmazz 2018-09-01 11:33:39 -04:00
parent 9180f9b7ef
commit f0244c8b71
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/sdl/mixer_sound.c
View file

@ -110,7 +110,13 @@ static void Midiplayer_Onchange(void)
Mix_Timidity_addToPathList(cv_miditimiditypath.string);
if (restart)
{
// HACK: Need to set cv_resetmusic to reload MIDI music
INT32 resetmusicval = cv_resetmusic.value;
cv_resetmusic.value = 1;
S_Start();
cv_resetmusic.value = resetmusicval;
}
}
static void MidiSoundfontPath_Onchange(void)
@ -123,9 +129,15 @@ static void MidiSoundfontPath_Onchange(void)
// check if file exists; menu calls this method at every keystroke
SDL_RWops *rw = SDL_RWFromFile(cv_midisoundfontpath.string, "r");
if (rw != NULL) {
INT32 resetmusicval = cv_resetmusic.value;
SDL_RWclose(rw);
Mix_SetSoundFonts(cv_midisoundfontpath.string);
// HACK: Need to set cv_resetmusic to reload MIDI music
cv_resetmusic.value = 1;
S_Start();
cv_resetmusic.value = resetmusicval;
}
}
}