From 59638acb7c28413dbf4da8f8373edffbe9440b0c Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Thu, 30 Aug 2012 03:00:37 +0000
Subject: [PATCH] - Fixed: MUSINFO must be parsed after MAPINFO, since it needs
 the entries created by MAPINFO.

SVN r3858 (trunk)
---
 src/d_main.cpp  | 3 +++
 src/s_sound.cpp | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/d_main.cpp b/src/d_main.cpp
index c428059e6b..ae28f15d8f 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -2218,6 +2218,9 @@ void D_DoomMain (void)
 		G_ParseMapInfo (iwad_info->MapInfo);
 		ReadStatistics();
 
+		// MUSINFO must be parsed after MAPINFO
+		S_ParseMusInfo();
+
 		Printf ("Texman.Init: Init texture manager.\n");
 		TexMan.Init();
 		C_InitConback();
diff --git a/src/s_sound.cpp b/src/s_sound.cpp
index a52e6cf39e..dc890c12b1 100644
--- a/src/s_sound.cpp
+++ b/src/s_sound.cpp
@@ -326,7 +326,6 @@ void S_InitData ()
 	LastLocalSndInfo = LastLocalSndSeq = "";
 	S_ParseSndInfo (false);
 	S_ParseSndSeq (-1);
-	S_ParseMusInfo();
 }
 
 //==========================================================================