Revert "Fix MIDI music not reloading sometimes on settings change"

This reverts commit be21072b58.
This commit is contained in:
mazmazz 2018-09-01 11:35:54 -04:00
parent be21072b58
commit 1aa4035594

View file

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