Merge branch 'rewrite/master' into bugfix/2hot-explosion-polymod

This commit is contained in:
Cameron Taylor 2024-03-05 14:37:47 -05:00
commit cdae96d179

View file

@ -2791,14 +2791,19 @@ class PlayState extends MusicBeatSubState
// TODO: Uncache the song. // TODO: Uncache the song.
} }
if (!overrideMusic) if (overrideMusic)
{ {
// Stop the music. // Stop the music. Do NOT destroy it, something still references it!
FlxG.sound.music.pause(); FlxG.sound.music.pause();
if (vocals != null) vocals.stop(); if (vocals != null)
{
vocals.pause();
remove(vocals);
}
} }
else else
{ {
// Stop and destroy the music.
FlxG.sound.music.pause(); FlxG.sound.music.pause();
if (vocals != null) if (vocals != null)
{ {