mirror of
https://github.com/FunkinCrew/Funkin.git
synced 2024-11-27 01:55:52 -05:00
Merge branch 'rewrite/master' into bugfix/2hot-explosion-polymod
This commit is contained in:
commit
cdae96d179
1 changed files with 8 additions and 3 deletions
|
@ -2791,14 +2791,19 @@ class PlayState extends MusicBeatSubState
|
|||
// 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();
|
||||
if (vocals != null) vocals.stop();
|
||||
if (vocals != null)
|
||||
{
|
||||
vocals.pause();
|
||||
remove(vocals);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Stop and destroy the music.
|
||||
FlxG.sound.music.pause();
|
||||
if (vocals != null)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue