From 15e82919034f35e75ae7dfd5e8e7dfa896cb6a68 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 29 Nov 2019 03:01:41 -0800
Subject: [PATCH] Reset the music fade in cvar pointer too

This fixes a bug with death fades.
---
 src/p_user.c  | 1 +
 src/s_sound.h | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/p_user.c b/src/p_user.c
index 7172bebd1..5fee0ac9b 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1271,6 +1271,7 @@ void P_RestoreMusic(player_t *player)
 
 			S_ChangeMusicEx(mapmusname, mapmusflags, true, position, 0,
 					S_GetRestoreMusicFadeIn());
+			S_ClearRestoreMusicFadeInCvar();
 			mapmusresume = 0;
 		}
 	}
diff --git a/src/s_sound.h b/src/s_sound.h
index c082b3dd6..8e94f8e16 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -187,6 +187,8 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32
 #define S_ChangeMusic(a,b,c) S_ChangeMusicEx(a,b,c,0,0,0)
 
 void S_SetRestoreMusicFadeInCvar (consvar_t *cvar);
+#define S_ClearRestoreMusicFadeInCvar() \
+	S_SetRestoreMusicFadeInCvar(0)
 int  S_GetRestoreMusicFadeIn (void);
 
 // Stops the music.