From 73b4c4c5b4c70ba4b1da2b9c5e3f8c2819caba26 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Sun, 26 Aug 2018 14:22:14 -0400 Subject: [PATCH] Fix S_ChangeMusic newmusic -> mmusic, merge error --- src/s_sound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s_sound.c b/src/s_sound.c index 56f6b46c4..f5fe5a5e4 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -1494,7 +1494,7 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping) return; } - if (strnicmp(music_name, newmusic, 6)) + if (strnicmp(music_name, mmusic, 6)) { S_StopMusic(); // shutdown old music