From 58ef056d482513579f68c533f86c679f69590967 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Fri, 31 Aug 2018 12:18:54 -0400 Subject: [PATCH] Fix MIDI not reloading when erroring on a player --- src/sdl/mixer_sound.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index 3fc329587..133a8ff84 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -81,7 +81,7 @@ static void Midiplayer_Onchange(void) { boolean restart = false; - if (I_SongType() != MU_MID_EX && I_SongType() != MU_MID) + if (I_SongType() != MU_NONE && I_SongType() != MU_MID_EX && I_SongType() != MU_MID) return; if (Mix_GetMidiPlayer() != cv_midiplayer.value) @@ -104,7 +104,7 @@ static void Midiplayer_Onchange(void) static void MidiSoundfontPath_Onchange(void) { - if (I_SongType() != MU_MID_EX && Mix_GetMidiPlayer() != MIDI_Fluidsynth) + if (I_SongType() != MU_NONE && I_SongType() != MU_MID_EX && Mix_GetMidiPlayer() != MIDI_Fluidsynth) return; if (stricmp(Mix_GetSoundFonts(), cv_midisoundfontpath.string)) @@ -148,14 +148,14 @@ void I_StartupSound(void) music = NULL; music_volume = sfx_volume = 0; -#if SDL_MIXER_VERSION_ATLEAST(1,2,11) - Mix_Init(MIX_INIT_FLAC|MIX_INIT_MOD|MIX_INIT_MP3|MIX_INIT_OGG); -#endif #if HAVE_MIXERX Mix_SetMidiPlayer(cv_midiplayer.value); Mix_SetSoundFonts(cv_midisoundfontpath.string); Mix_Timidity_addToPathList(cv_miditimiditypath.string); #endif +#if SDL_MIXER_VERSION_ATLEAST(1,2,11) + Mix_Init(MIX_INIT_FLAC|MIX_INIT_MOD|MIX_INIT_MP3|MIX_INIT_OGG); +#endif if (Mix_OpenAudio(44100, AUDIO_S16SYS, 2, 2048) < 0) {