Skip to content

Commit faf24b4

Browse files
committed
Merge branch 'internal-merge' of https://github.com/CodenameCrew/CodenameEngine into internal-merge
2 parents 735bb82 + 793bc23 commit faf24b4

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

source/funkin/editors/charter/Charter.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ class Charter extends UIState {
626626
// force full load the audio datas for waveform, maybe in the future dont do this and
627627
// make it so it continously loads the only necessary waveform data in preview?
628628

629-
if (FlxG.sound.music.data?.buffer?.data == null) {
629+
if (FlxG.sound.music.data?.buffer != null && FlxG.sound.music.data.buffer.data == null) {
630630
FlxG.sound.music.data.buffer.load();
631631
FlxG.sound.music.data.buffer.decoder?.dispose();
632632
FlxG.sound.music.data.buffer.decoder = null;
@@ -635,7 +635,7 @@ class Charter extends UIState {
635635
if (Assets.exists(Paths.voices(__song, __diff, PlayState.SONG.meta.vocalsSuffix))) {
636636
vocals = FlxG.sound.load(Paths.voices(__song, __diff, PlayState.SONG.meta.vocalsSuffix));
637637

638-
if (vocals.data?.buffer?.data == null) {
638+
if (vocals.data?.buffer != null && vocals.data.buffer.data == null) {
639639
vocals.data.buffer.load();
640640
vocals.data.buffer.decoder?.dispose();
641641
vocals.data.buffer.decoder = null;

source/funkin/editors/charter/CharterStrumline.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class CharterStrumline extends UISprite {
154154
}
155155
vocals.group = FlxG.sound.defaultMusicGroup;
156156

157-
if (vocals.data?.buffer?.data == null) {
157+
if (vocals.data?.buffer != null && vocals.data.buffer.data == null) {
158158
vocals.data.buffer.load();
159159
vocals.data.buffer.decoder?.dispose();
160160
vocals.data.buffer.decoder = null;

0 commit comments

Comments
 (0)