From 222e45ada17eec0f77bcfd702e72efb6746d9695 Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Fri, 10 Sep 2021 19:37:33 -0700
Subject: [PATCH] Music: Do not do fades if not playing

This fixes a regression where entering playtesting while a track was
fading out (by exiting out of playtesting with a track playing and then
immediately entering back in with the level start music set) would
result in no music.

The cause is the game doing fades even though nothing is playing, which
puts it in a confusing state.
---
 desktop_version/src/Music.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp
index 3988b526..6dab5359 100644
--- a/desktop_version/src/Music.cpp
+++ b/desktop_version/src/Music.cpp
@@ -328,6 +328,11 @@ static enum FadeCode processmusicfade(struct FadeState* state, int* volume)
 
 void musicclass::fadeMusicVolumeIn(int ms)
 {
+	if (halted())
+	{
+		return;
+	}
+
 	m_doFadeInVol = true;
 	m_doFadeOutVol = false;
 
@@ -345,6 +350,11 @@ void musicclass::fadeMusicVolumeIn(int ms)
 
 void musicclass::fadeMusicVolumeOut(const int fadeout_ms)
 {
+	if (halted())
+	{
+		return;
+	}
+
 	m_doFadeInVol = false;
 	m_doFadeOutVol = true;