diff --git a/src/s_sound.c b/src/s_sound.c index 5019213fb..b36783d41 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2244,10 +2244,15 @@ void S_CheckMap(void) // void S_InitMapMusic(void) { - char *maptitle = G_BuildMapTitle(gamemap); - skipintromus = cv_skipintromusic.value && stricmp(maptitle, "Wandering Falls") != 0; // thanks diggle! - if (maptitle) - Z_Free(maptitle); + if (!cv_skipintromusic.value) + skipintromus = false; + else + { + char *maptitle = G_BuildMapTitle(gamemap); + skipintromus = cv_skipintromusic.value && stricmp(maptitle, "Wandering Falls") != 0; // thanks diggle! + if (maptitle) + Z_Free(maptitle); + } if (mapmusflags & MUSIC_RELOADRESET) {