From 43e8d31aa9be31957d502d30c9da4cf105b0982e Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Mon, 14 Jun 2021 15:11:39 -0400 Subject: [PATCH] Music: Enforce the quick fade time as soon as we know it's happening. Not every music path will trip the quick_fade bool that resets the timer to 500ms, so we need to do this as soon as it's asked of us. This fixes the fade when quitting to the main menu. Fixes #764 --- desktop_version/src/Music.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp index 0b76695c..15bc1ece 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -351,7 +351,7 @@ void musicclass::fadeMusicVolumeOut(const int fadeout_ms) void musicclass::fadeout(const bool quick_fade_ /*= true*/) { - fadeMusicVolumeOut(2000); + fadeMusicVolumeOut(quick_fade_ ? 500 : 2000); quick_fade = quick_fade_; }