From eb787c2b59ef6391bb4db8c25b514f9ab972f342 Mon Sep 17 00:00:00 2001
From: Steel Titanium <steeltitanium1@gmail.com>
Date: Thu, 12 Dec 2019 16:32:40 -0500
Subject: [PATCH] Move S_InitMusicDefs call outside of the check.

As far as I know, this is competely safe.
---
 src/d_main.c  | 3 ++-
 src/s_sound.c | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 3974062932..ae2750da86 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1281,9 +1281,10 @@ void D_SRB2Main(void)
 		I_StartupSound();
 		I_InitMusic();
 		S_InitSfxChannels(cv_soundvolume.value);
-		S_InitMusicDefs();
 	}
 
+	S_InitMusicDefs();
+
 	CONS_Printf("ST_Init(): Init status bar.\n");
 	ST_Init();
 
diff --git a/src/s_sound.c b/src/s_sound.c
index 1d9c06cca1..a494990407 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -2543,7 +2543,6 @@ void GameDigiMusic_OnChange(void)
 		I_StartupSound(); // will return early if initialised
 		I_InitMusic();
 		S_StopMusic();
-		S_InitMusicDefs();
 		if (Playing())
 			P_RestoreMusic(&players[consoleplayer]);
 		else
@@ -2586,7 +2585,6 @@ void GameMIDIMusic_OnChange(void)
 		midi_disabled = false;
 		I_StartupSound(); // will return early if initialised
 		I_InitMusic();
-		S_InitMusicDefs();
 		if (Playing())
 			P_RestoreMusic(&players[consoleplayer]);
 		else
-- 
GitLab