Merge branch 'rewrite/master' into bugfix/senpai-naughty

This commit is contained in:
Cameron Taylor 2023-11-16 02:02:08 -05:00 committed by GitHub
commit 270a527602

View file

@ -4506,6 +4506,16 @@ class ChartEditorState extends HaxeUIState
function resetConductorAfterTest(_:FlxSubState = null):Void
{
moveSongToScrollPosition();
var instVolumeSlider:Null<Slider> = findComponent('menubarItemVolumeInstrumental', Slider);
var vocalVolumeSlider:Null<Slider> = findComponent('menubarItemVolumeVocals', Slider);
// Reapply the volume.
var instTargetVolume:Float = instVolumeSlider?.value ?? 1.0;
var vocalTargetVolume:Float = vocalVolumeSlider?.value ?? 1.0;
if (audioInstTrack != null) audioInstTrack.volume = instTargetVolume;
if (audioVocalTrackGroup != null) audioVocalTrackGroup.volume = vocalTargetVolume;
}
/**