Fixed bug 4770 - Mix_FadeOutChannel never sets fade_volume_reset

libsdl-org · Aug 21, 2019 · 2cdd20b · 2cdd20b
1 parent e1dc59f
commit 2cdd20b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/mixer.c b/mixer.c
@@ -1044,9 +1044,11 @@ int Mix_FadeInChannelTimed(int which, Mix_Chunk *chunk, int loops, int ms, int t
             mix_channel[which].looping = loops;
             mix_channel[which].chunk = chunk;
             mix_channel[which].paused = 0;
+            if (mix_channel[which].fading == MIX_NO_FADING) {
+                mix_channel[which].fade_volume_reset = mix_channel[which].volume;
+            }
             mix_channel[which].fading = MIX_FADING_IN;
             mix_channel[which].fade_volume = mix_channel[which].volume;
-            mix_channel[which].fade_volume_reset = mix_channel[which].volume;
             mix_channel[which].volume = 0;
             mix_channel[which].fade_length = (Uint32)ms;
             mix_channel[which].start_time = mix_channel[which].ticks_fade = sdl_ticks;
@@ -1153,14 +1155,16 @@ int Mix_FadeOutChannel(int which, int ms)
                 (mix_channel[which].volume > 0) &&
                 (mix_channel[which].fading != MIX_FADING_OUT)) {
                 mix_channel[which].fade_volume = mix_channel[which].volume;
-                mix_channel[which].fading = MIX_FADING_OUT;
                 mix_channel[which].fade_length = (Uint32)ms;
                 mix_channel[which].ticks_fade = SDL_GetTicks();
 
                 /* only change fade_volume_reset if we're not fading. */
                 if (mix_channel[which].fading == MIX_NO_FADING) {
                     mix_channel[which].fade_volume_reset = mix_channel[which].volume;
                 }
+
+                mix_channel[which].fading = MIX_FADING_OUT;
+
                 ++status;
             }
             Mix_UnlockAudio();