From be9a6382ea25021de99aacb915b39b3d0685e74d Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 14 Apr 2021 09:34:01 -0700 Subject: [PATCH] Fix playing same track after it has faded out If a track was restarted after it faded out, then it wouldn't play. This is because currentsong wasn't set to -1 after fading out, and that is because the fade out calls pause() instead of haltdasmusik() when it finishes. Unlike f196fcd896defc0b24690851c701b8273ba8074b, this fixes the time trial music while keeping it to the same behavior as 2.2, and fixes every single possible case that this music bug could have happened. --- 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 f69d054f..05e5c644 100644 --- a/desktop_version/src/Music.cpp +++ b/desktop_version/src/Music.cpp @@ -330,7 +330,7 @@ void musicclass::processmusicfadeout(void) { musicVolume = 0; m_doFadeOutVol = false; - pause(); + haltdasmusik(); } }