From dac5ad41ce511687da28ca2135d1130588db1a19 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Tue, 21 Mar 2023 14:16:21 +0100
Subject: [PATCH] Fix mistake with S_GetMusicLumpNum

---
 src/s_sound.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/s_sound.c b/src/s_sound.c
index 8fda04a57..f2281b18d 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -2104,14 +2104,10 @@ boolean S_RecallMusic(UINT16 status, boolean fromfirst)
 
 static lumpnum_t S_GetMusicLumpNum(const char *mname)
 {
-	boolean midipref = cv_musicpref.value;
-
 	if (S_MusicPrefExists(mname))
-		return W_GetNumForName(va(midipref ? "d_%s":"o_%s", mname));
-	else if (S_MusicPrefExists(mname))
-		return W_GetNumForName(va(midipref ? "o_%s":"d_%s", mname));
-	else
-		return LUMPERROR;
+		return W_CheckNumForName(va(cv_musicpref.value ? "d_%s":"o_%s", mname));
+	else // see if the other music type exists
+		return W_CheckNumForName(va(cv_musicpref.value ? "o_%s":"d_%s", mname));
 }
 
 static boolean S_LoadMusic(const char *mname)
-- 
GitLab